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

Jenkins自动合并

Browse Source
yun-zuoyi
jenkins 5 years ago
parent e306cc6cdc 018908d3cb
commit b96d22b011
4 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File

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

@ -210,9 +210,6 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("优先级")
private Integer priority;
@Transient
@ApiParam("优先级描述")
private String priorityStr;
public String getRecommondLot() {
return recommondLot == null ? "无" : this.recommondLot;

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

@ -62,6 +62,10 @@ public class WmsMoveDetails extends BaseBean {
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
@Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "已处理数量", example = "0")
public Double handledQty;
public Double getTransQty() {
return this.transQty == null ? 0 : this.transQty.doubleValue();
}

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

@ -124,14 +124,18 @@ public class WmsStockQuan extends BaseBean {
private String prodCfgTypeName;
@Transient
@ApiParam(value = "箱数", example = "-1")
@ApiParam(value = "箱数")
private Integer boxQty;
@Transient
@ApiParam(value = "零件数", example = "-1")
@ApiParam(value = "零件数")
private Double partQty;
@Transient
@ApiParam(value = "处理中数量")
private Double transQty;
@Transient
@ApiParam(value = "ERP库存地")
private String areaNo;
@ -211,7 +215,7 @@ public class WmsStockQuan extends BaseBean {
public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName,
Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty,
Double consignQty, Double lockQty,Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
this.whNo = whNo;
this.zoneNo = zoneNo;
this.partNo = partNo;
@ -281,5 +285,6 @@ public class WmsStockQuan extends BaseBean {
this.consignQty = consignQty;
this.lockQty = lockQty;
this.scrapQty = scrapQty;
this.totalQty = qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + scrapQty;
}
}

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

@ -229,13 +229,13 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getContainerNo(), "containerNo", result);
if (wmsPOMaster.getPriorRC()!=null&&wmsPOMaster.getPriorRC()==WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()){
if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) {
ArrayList<Integer> numList = new ArrayList<>();
numList.add(0);
numList.add(wmsPOMaster.getPriorRC());
numList.add(null);
DdlPreparedPack.getNotOrIsNull(numList, "priorRC", result);
}else{
} else {
DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result);
}
@ -923,8 +923,8 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo",result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(),"qualityDate",result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(), "packageNo", result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(), "qualityDate", result);
if (wmsStockSn.getSnStatus() == null) {
DdlPreparedPack.getInPackArray(new Integer[]{
WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(),
@ -1613,7 +1613,9 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
DdlPreparedPack.getOrderByPack(
new Object[]{CommonEnumUtil.FALSE, CommonEnumUtil.FALSE},
new String[]{"sn", "createDatetime"}, result);
return result;
}
@ -2007,8 +2009,8 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(),"vendorNo", result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(), "packageNo", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringNotNullPack("locateNo", result);
result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''");
@ -2618,15 +2620,15 @@ public class WmsHqlPack {
* @param wmsPullTaskMaster
* @return
*/
public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) {
public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster, String statusList) {
DdlPackBean result = new DdlPackBean();
List<String> stringList = null;
List<Integer> integerList = null;
//List<Integer> integers = Arrays.stream(statusList.split(",")).map(Integer::parseInt).collect(Collectors.toList());
if(StringUtils.isNotBlank(statusList)){
if (StringUtils.isNotBlank(statusList)) {
stringList = Arrays.asList(statusList.split(","));
integerList = new ArrayList<>();
for(String sl : stringList){
for (String sl : stringList) {
integerList.add(Integer.valueOf(sl));
}
}

Write Preview
Loading…
Cancel
Save