I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
yun-zuoyi
puxiao.liao 5 years ago
parent 7062e7a383 14bb71f9f2
commit b8701bc398
9 changed files with 48 additions and 38 deletions
Show Stats Download Patch File Download Diff File

9
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -3915,6 +3915,15 @@ public class WmsEnumUtil {
}
return tmp;
}
public static PRINT_TYPE codeOf(int value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
}
/**

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
Unescape Escape View File

@ -26,7 +26,7 @@ import java.io.Serializable;
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"})
})
@Api("包装规格")
@Api("包装表")
public class MesPackage extends BaseBean implements Serializable {
private static final long serialVersionUID = 5275923991324889995L;

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java
Unescape Escape View File

@ -30,7 +30,7 @@ public class ActorMessageModel {
}
public static ActorMessageModel getFailure() {
return new ActorMessageModel(true, null);
return new ActorMessageModel(false, null);
}
public static ActorMessageModel getSuccess(Object data) {

10
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java
Unescape Escape View File

@ -18,8 +18,16 @@ public class CellFeedModel {
private String partNo;
private String partName;
private String itemPartNo;
private String qty;
private String itemPartName;
private String shouldQty;
private String remainQty;
private String scanQty;
}

20
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
Unescape Escape View File

@ -71,6 +71,8 @@ public class QueueOrderModel implements Serializable {
@ApiParam("队列编号")
private String orderNo;
@ApiParam("料架是否已打印")
private Integer isGroupPrinted;
public QueueOrderModel() {
}
@ -155,13 +157,14 @@ public class QueueOrderModel implements Serializable {
this.orderNo = orderNo;
}
public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) {
public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted) {
this.id = id;
this.queDetailSeq = queDetailSeq;
this.pgCode = pgCode;
this.queueGroupNo = queueGroupNo;
this.groupNo = groupNo;
this.prodCfgCode = prodCfgCode;
this.isGroupPrinted = isGroupPrinted;
}
public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
@ -197,7 +200,7 @@ public class QueueOrderModel implements Serializable {
this.orderNo = orderNo;
}
public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String partNo, String partNameRdd, String workType) {
this.id = id;
this.queueSeq = queueSeq;
@ -209,5 +212,18 @@ public class QueueOrderModel implements Serializable {
this.partNameRdd = partNameRdd;
this.workType = workType;
this.orderNo = orderNo;
this.serialNumber=serialNumber;
}
//料架分组队列展示组件
public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo,
Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) {
this.queueGroupNo = queueGroupNo;
this.groupNo = groupNo;
this.orderNo = orderNo;
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.organizeCode = organizeCode;
}
}

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
Unescape Escape View File

@ -110,6 +110,11 @@ public class StationRequestBean implements Serializable {
@ApiParam("当前流程状态")
private MesRouteStatus curRouteStatus;
@ApiParam("展示组件")
private Object moduleService;
@ApiParam("工步序号")
private Integer stepSeq;
@Override
public String toString() {
return "StationRequestBean{" +

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
Unescape Escape View File

@ -314,6 +314,10 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "集装箱号")
private String containerNo;
@Transient
@ApiParam(value = "箱数")
private Integer boxQty;
public WmsStockSn() {
}

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -2590,7 +2590,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringLikerPack(wmsPrintingQueue.getPrintNo(), "printNo", result);
DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result);
DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result);
// DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result);
getStringBuilderPack(wmsPrintingQueue, result);

32
pom.xml
Unescape Escape View File

@ -221,37 +221,5 @@
<!--</plugin>-->
<!--</plugins>-->
<!--</build>-->
<profiles>
<profile>
<id>dev</id>
<properties>
<profileActive>DEV</profileActive>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<id>test</id>
<properties>
<profileActive>TEST</profileActive>
</properties>
</profile>
<profile>
<id>docker</id>
<properties>
<profileActive>DOCKER</profileActive>
</properties>
</profile>
<profile>
<id>prod</id>
<properties>
<profileActive>PROD</profileActive>
</properties>
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>
Write Preview
Loading…
Cancel
Save