diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
index 909f8523..b5b9ee12 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
@@ -12,7 +12,6 @@ import com.foreverwin.mesnac.common.service.SfcDispatchCommonService;
import com.foreverwin.mesnac.meapi.service.NcCodeService;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.R;
-import com.sap.me.frame.service.CommonMethods;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +23,7 @@ import java.util.Map;
/**
*
* @author zjw
- * @since 2021-08-16
+ * @since 2021-09-15
*/
@RestController
@RequestMapping("/Z-ABNORMAL-BILL")
@@ -80,7 +79,6 @@ public class AbnormalBillController {
public R page(FrontPage frontPage, AbnormalBill abnormalBill){
IPage result;
QueryWrapper queryWrapper = new QueryWrapper<>();
- abnormalBill.setSite(CommonMethods.getSite());
queryWrapper.setEntity(abnormalBill);
if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
//TODO modify global query
@@ -120,6 +118,10 @@ public class AbnormalBillController {
.or().like(AbnormalBill::getCancelSendUserGroup, frontPage.getGlobalQuery())
.or().like(AbnormalBill::getCreatedUser, frontPage.getGlobalQuery())
.or().like(AbnormalBill::getModifiedUser, frontPage.getGlobalQuery())
+ .or().like(AbnormalBill::getProductCategory, frontPage.getGlobalQuery())
+ .or().like(AbnormalBill::getStepId, frontPage.getGlobalQuery())
+ .or().like(AbnormalBill::getWorkOrder, frontPage.getGlobalQuery())
+ .or().like(AbnormalBill::getItemNumber, frontPage.getGlobalQuery())
);
}
result = abnormalBillService.page(frontPage.getPagePlus(), queryWrapper);
@@ -168,7 +170,6 @@ public class AbnormalBillController {
return R.ok(abnormalBillService.removeByIds(ids));
}
-
/**
* 拆分弹出框
*
@@ -423,5 +424,4 @@ public class AbnormalBillController {
return R.ok(ncCodeService.findNcCodeDescriptionByNcCode(ncCode));
}
-
}
\ No newline at end of file
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java
index 430f3f77..300c2fea 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java
@@ -14,8 +14,8 @@ import java.time.LocalDateTime;
* 异常单
*
*
- * @author Philip
- * @since 2021-09-01
+ * @author zjw
+ * @since 2021-09-15
*/
@TableName("Z_ABNORMAL_BILL")
@@ -229,11 +229,21 @@ public class AbnormalBill extends Model {
*/
@TableField("PRODUCT_CATEGORY")
private String productCategory;
- /**
- * 工步
- */
+ /**
+ * 工步
+ */
@TableField("STEP_ID")
private String stepId;
+ /**
+ * 工作令
+ */
+ @TableField("WORK_ORDER")
+ private String workOrder;
+ /**
+ * 项目号
+ */
+ @TableField("ITEM_NUMBER")
+ private String itemNumber;
@TableField(exist = false)
private String filePath;
@@ -245,6 +255,8 @@ public class AbnormalBill extends Model {
private String fileNum;
+
+
public String getHandle() {
return handle;
}
@@ -573,6 +585,30 @@ public class AbnormalBill extends Model {
this.productCategory = productCategory;
}
+ public String getStepId() {
+ return stepId;
+ }
+
+ public void setStepId(String stepId) {
+ this.stepId = stepId;
+ }
+
+ public String getWorkOrder() {
+ return workOrder;
+ }
+
+ public void setWorkOrder(String workOrder) {
+ this.workOrder = workOrder;
+ }
+
+ public String getItemNumber() {
+ return itemNumber;
+ }
+
+ public void setItemNumber(String itemNumber) {
+ this.itemNumber = itemNumber;
+ }
+
public String getFilePath() {
return filePath;
}
@@ -597,14 +633,6 @@ public class AbnormalBill extends Model {
this.fileNum = fileNum;
}
- public String getStepId() {
- return stepId;
- }
-
- public void setStepId(String stepId) {
- this.stepId = stepId;
- }
-
public static final String HANDLE = "HANDLE";
public static final String SITE = "SITE";
@@ -685,6 +713,13 @@ public static final String MODIFIED_USER = "MODIFIED_USER";
public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
+public static final String PRODUCT_CATEGORY = "PRODUCT_CATEGORY";
+
+public static final String STEP_ID = "STEP_ID";
+
+public static final String WORK_ORDER = "WORK_ORDER";
+
+public static final String ITEM_NUMBER = "ITEM_NUMBER";
@Override
@@ -692,4 +727,53 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
return this.handle;
}
+ @Override
+ public String toString() {
+ return "AbnormalBill{" +
+ "handle = " + handle +
+ ", site = " + site +
+ ", abnormalNo = " + abnormalNo +
+ ", status = " + status +
+ ", correction = " + correction +
+ ", program = " + program +
+ ", type = " + type +
+ ", itemBo = " + itemBo +
+ ", sfc = " + sfc +
+ ", operation = " + operation +
+ ", workCenter = " + workCenter +
+ ", shopOrder = " + shopOrder +
+ ", messageType = " + messageType +
+ ", resrce = " + resrce +
+ ", ncCode = " + ncCode +
+ ", shutDown = " + shutDown +
+ ", responseUser = " + responseUser +
+ ", responseDateTime = " + responseDateTime +
+ ", pbDescription = " + pbDescription +
+ ", ncQty = " + ncQty +
+ ", pbGrade = " + pbGrade +
+ ", pbUser = " + pbUser +
+ ", pbQty = " + pbQty +
+ ", repairDateTime = " + repairDateTime +
+ ", discover = " + discover +
+ ", inspector = " + inspector +
+ ", entityLocation = " + entityLocation +
+ ", reportFrom = " + reportFrom +
+ ", objectBo = " + objectBo +
+ ", pbPhotoshop = " + pbPhotoshop +
+ ", cancelCode = " + cancelCode +
+ ", cancelReason = " + cancelReason +
+ ", cancelDateTime = " + cancelDateTime +
+ ", cancelUser = " + cancelUser +
+ ", reportSendUserGroup = " + reportSendUserGroup +
+ ", cancelSendUserGroup = " + cancelSendUserGroup +
+ ", createdUser = " + createdUser +
+ ", createdDateTime = " + createdDateTime +
+ ", modifiedUser = " + modifiedUser +
+ ", modifiedDateTime = " + modifiedDateTime +
+ ", productCategory = " + productCategory +
+ ", stepId = " + stepId +
+ ", workOrder = " + workOrder +
+ ", itemNumber = " + itemNumber +
+ "}";
+ }
}
\ No newline at end of file
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
index 22e9496c..12f2f620 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
@@ -134,7 +134,7 @@ public interface AbnormalBillService extends IService {
/**
* 异常发送消息
*/
- boolean anomalyCreatedAndSendMessage(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose);
+ boolean anomalyCreatedAndSendMessage(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose);
/**
* 格式化消息
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index 411d56f5..b48bce07 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -1143,7 +1143,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl
+
+
-
@@ -79,7 +80,7 @@
- HANDLE, SITE, ABNORMAL_NO, STATUS, CORRECTION, PROGRAM, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, REPORT_SEND_USER_GROUP, CANCEL_SEND_USER_GROUP, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME, PRODUCT_CATEGORY, STEP_ID
+ HANDLE, SITE, ABNORMAL_NO, STATUS, CORRECTION, PROGRAM, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, REPORT_SEND_USER_GROUP, CANCEL_SEND_USER_GROUP, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME, PRODUCT_CATEGORY, STEP_ID, WORK_ORDER, ITEM_NUMBER
@@ -155,6 +156,8 @@
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
AND PRODUCT_CATEGORY=#{ew.entity.productCategory}
AND STEP_ID=#{ew.entity.stepId}
+ AND WORK_ORDER=#{ew.entity.workOrder}
+ AND ITEM_NUMBER=#{ew.entity.itemNumber}
@@ -207,6 +210,8 @@
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
AND PRODUCT_CATEGORY=#{ew.entity.productCategory}
AND STEP_ID=#{ew.entity.stepId}
+ AND WORK_ORDER=#{ew.entity.workOrder}
+ AND ITEM_NUMBER=#{ew.entity.itemNumber}
${ew.sqlSegment}
@@ -267,6 +272,8 @@
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
AND PRODUCT_CATEGORY=#{ew.entity.productCategory}
AND STEP_ID=#{ew.entity.stepId}
+ AND WORK_ORDER=#{ew.entity.workOrder}
+ AND ITEM_NUMBER=#{ew.entity.itemNumber}
${ew.sqlSegment}
@@ -327,6 +334,8 @@
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
AND PRODUCT_CATEGORY=#{ew.entity.productCategory}
AND STEP_ID=#{ew.entity.stepId}
+ AND WORK_ORDER=#{ew.entity.workOrder}
+ AND ITEM_NUMBER=#{ew.entity.itemNumber}
${ew.sqlSegment}
@@ -387,6 +396,8 @@
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
AND PRODUCT_CATEGORY=#{ew.entity.productCategory}
AND STEP_ID=#{ew.entity.stepId}
+ AND WORK_ORDER=#{ew.entity.workOrder}
+ AND ITEM_NUMBER=#{ew.entity.itemNumber}
${ew.sqlSegment}
@@ -447,14 +458,16 @@
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
AND PRODUCT_CATEGORY=#{ew.entity.productCategory}
AND STEP_ID=#{ew.entity.stepId}
+ AND WORK_ORDER=#{ew.entity.workOrder}
+ AND ITEM_NUMBER=#{ew.entity.itemNumber}
- AND ${ew.sqlSegment}
+ ${ew.sqlSegment}
- AND ${ew.sqlSegment}
+ ${ew.sqlSegment}
@@ -507,6 +520,8 @@
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
AND PRODUCT_CATEGORY=#{ew.entity.productCategory}
AND STEP_ID=#{ew.entity.stepId}
+ AND WORK_ORDER=#{ew.entity.workOrder}
+ AND ITEM_NUMBER=#{ew.entity.itemNumber}
${ew.sqlSegment}
@@ -563,6 +578,8 @@
MODIFIED_DATE_TIME,
PRODUCT_CATEGORY,
STEP_ID,
+ WORK_ORDER,
+ ITEM_NUMBER,
VALUES
#{handle},
@@ -607,6 +624,8 @@
#{modifiedDateTime},
#{productCategory},
#{stepId},
+ #{workOrder},
+ #{itemNumber},
@@ -658,6 +677,8 @@
#{modifiedDateTime},
#{productCategory},
#{stepId},
+ #{workOrder},
+ #{itemNumber},
@@ -705,6 +726,8 @@
MODIFIED_DATE_TIME=#{et.modifiedDateTime},
PRODUCT_CATEGORY=#{et.productCategory},
STEP_ID=#{et.stepId},
+ WORK_ORDER=#{et.workOrder},
+ ITEM_NUMBER=#{et.itemNumber},
WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}
@@ -752,6 +775,8 @@
MODIFIED_DATE_TIME=#{et.modifiedDateTime},
PRODUCT_CATEGORY=#{et.productCategory},
STEP_ID=#{et.stepId},
+ WORK_ORDER=#{et.workOrder},
+ ITEM_NUMBER=#{et.itemNumber},
WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}
@@ -799,6 +824,8 @@
MODIFIED_DATE_TIME=#{et.modifiedDateTime},
PRODUCT_CATEGORY=#{et.productCategory},
STEP_ID=#{et.stepId},
+ WORK_ORDER=#{et.workOrder},
+ ITEM_NUMBER=#{et.itemNumber},
@@ -845,6 +872,8 @@
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
AND PRODUCT_CATEGORY=#{ew.entity.productCategory}
AND STEP_ID=#{ew.entity.stepId}
+ AND WORK_ORDER=#{ew.entity.workOrder}
+ AND ITEM_NUMBER=#{ew.entity.itemNumber}
${ew.sqlSegment}
@@ -922,6 +951,8 @@
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
AND PRODUCT_CATEGORY=#{ew.entity.productCategory}
AND STEP_ID=#{ew.entity.stepId}
+ AND WORK_ORDER=#{ew.entity.workOrder}
+ AND ITEM_NUMBER=#{ew.entity.itemNumber}
${ew.sqlSegment}
@@ -940,7 +971,6 @@
-