10539622/2025-03-JS-SDK-svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Compare commits

base: 10539622:1b730f657f76f44c327b90b5cdbbc79307259403
Branches Tags
10539622:main
...
compare: 10539622:ff6484dcae16b7388b05203677a2247fbe8663d8
Branches Tags
10539622:main

2 Commits
1b730f657f ... ff6484dcae

Author SHA1 Message Date
郭飞
ff6484dcae Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr 2025-05-13 10:59:09 +08:00
郭飞
016af18df6 fix:修改qms字段 2025-05-13 10:58:10 +08:00
4 changed files with 21 additions and 6 deletions
Show Stats Expand all files Collapse all files

13
zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequestdetail/management/data/MaterialShipRequestDetail.java
View File

@ -15,7 +15,7 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo
private double requestQuantity;
private double assignedQuantity;
private String posid;
@ -188,6 +188,17 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo
@UserColumnMark
private String erpFactory;
public String getAuart() {
return auart;
}
public void setAuart(String auart) {
this.auart = auart;
}
@UserColumnMark
private String auart;
public String getSaleOutQuantity() {
return saleOutQuantity;
}

8
zi-wms-pda/src/main/java/com/cim/idm/controller/NoChargeStockIn.java
View File

@ -253,12 +253,12 @@ public class NoChargeStockIn {
for (MaterialReceiveRequest request : requests) {
String billcode = null;
// 采购订单
if (ReceiveTypeEnums.isPurchase(request.getReceiveRequestType())) {
// if (ReceiveTypeEnums.isPurchase(request.getReceiveRequestType())) {
Map<String,Object> args = new HashMap<>();
billcode = toSAPServiceImpl.PurStockIn(request.getReceiveRequestName(), siteName, user, args,commitDate);
}else {
billcode = toSAPServiceImpl.SaleReturn(request.getReceiveRequestName(), siteName, user, commitDate, opCode);
}
// }else {
// billcode = toSAPServiceImpl.SaleReturn(request.getReceiveRequestName(), siteName, user, commitDate, opCode);
// }
// @TODO 其他类型
if (billcode == null || "".equals(billcode)) {
return AjaxResult.me().setErrorCode(500).setSuccess(false).setMessage("SAP过账失败");

2
zi-wms-pda/src/main/java/com/cim/idm/controller/QMSController.java
View File

@ -472,7 +472,7 @@ public class QMSController {
}
}
} else if ("1".equals(tpType) || "2".equals(tpType) || "3".equals(tpType) || "4".equals(tpType) || "5".equals(tpType) || "7".equals(tpType)) {//料号+批次
String kcsql = "SELECT M.SITENAME ,M.MATERIALPACKINGNAME FROM MATERIALPACKING M "
String kcsql = "SELECT M.SITENAME ,M.MATERIALPACKINGNAME,M.OQARESULT FROM MATERIALPACKING M "
+ "WHERE M.CHARGE = :BATCH AND M.MATERIALSPECNAME = :MATERIALSPECNAME";
Map<String, Object> hashMap = new HashMap<String,Object> ();
hashMap.put("BATCH", commonNumber);

4
zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java
View File

@ -1291,6 +1291,7 @@ public class SAPToWMSController {
String ummat = MapUtils.getString(item, "UMMAT"); // 形态转换->目标物料类型
String xloek= MapUtils.getString(item, "xloek"); // 删除标识
String auart= MapUtils.getString(item, "AUART"); // 接收生产订单类型 返工ZP05 复卷ZP01
MaterialShipRequestDetail mrd =new MaterialShipRequestDetail();
@ -1401,6 +1402,8 @@ public class SAPToWMSController {
bindMapItem.put("goalMaterialSpec", ummat);
bindMapItem.put("phase", phase);
bindMapItem.put("saleOutQuantity", 0);
bindMapItem.put("auart", auart);
if("07".equals(shipRequestType) || "03".equals(shipRequestType)) {
bindMapItem.put("receiveRequestDetailType", shipRequestType); // 原单号
@ -1482,6 +1485,7 @@ public class SAPToWMSController {
bindMapItem.put("goalMaterialSpec", ummat);
bindMapItem.put("phase", phase);
bindMapItem.put("saleOutQuantity", 0);
bindMapItem.put("auart", auart);
nonPrimaryKeyValueInfo.setUserColumns(bindMapItem);
EventInfo eventInfo = new EventInfo();