diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java index 7e1103a..45c5589 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java @@ -60,4 +60,21 @@ public class WmsMessageStyleModel implements Serializable { this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); } } + + public WmsMessageStyleModel(String message, double transQty, double actQty, boolean showRed) { + this.message = message; + if (actQty == 0) {//未处理 + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue(); + } else if (transQty > actQty) {//处理中 + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue(); + } else if (actQty == transQty) {//处理完成 + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); + } else if (transQty < actQty) {//处理数量大于需求数量-显示红色 + if (showRed) { + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CLOSED.getValue(); + } else { + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); + } + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 8772b84..22d79be 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -88,6 +88,11 @@ public class WmsMoveSn extends BaseBean { @ApiParam("批次编号") public String lotNo; + @Column(name = "LEFT_CODE") + @ApiParam(value = "生产批次") + private String leftCode = ""; + + @Column(name = "PACKAGE_NO") @ApiParam("容器编号") public String packAgeNo;