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:6b1bc8c7f6f1845a04f04e2fcbc890510d6676f4
Branches Tags
10539622:main
..
compare: 10539622:26ef3fd081d7385cf062eba28bfa5cc889051f8e
Branches Tags
10539622:main

2 Commits
6b1bc8c7f6 ... 26ef3fd081

Author SHA1 Message Date
郭飞
26ef3fd081 Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr 2025-05-08 16:13:36 +08:00
郭飞
19a968333c fix:修改有批次入库和领料下发mes 2025-05-08 16:12:53 +08:00
7 changed files with 18 additions and 13 deletions
Show Stats Expand all files Collapse all files

4
zi-wms-inf/src/main/java/com/cim/idm/service/impl/MESServiceImpl.java
View File

@ -583,8 +583,8 @@ public class MESServiceImpl implements MESService{
jsonObject.put("qrCode", list.get(i).get("MATERIALPACKINGNAME")); jsonObject.put("qrCode", list.get(i).get("MATERIALPACKINGNAME"));
jsonObject.put("consumableSpecName", list.get(i).get("MATERIALSPECNAME")); jsonObject.put("consumableSpecName", list.get(i).get("MATERIALSPECNAME"));
jsonObject.put("consumableType", list.get(i).get("MATERIALTYPE")); jsonObject.put("consumableType", list.get(i).get("MATERIALTYPE"));
String product = list.get(i).get("WO").toString(); String product = list.get(i).get("WO") == null ? "" : list.get(i).get("WO").toString();
jsonObject.put("productRequestName", product.substring(4)); jsonObject.put("productRequestName", product.isEmpty() ? "" : product.substring(4));
jsonObject.put("expiringDate", list.get(i).get("EXPIRINGDATE")); jsonObject.put("expiringDate", list.get(i).get("EXPIRINGDATE"));
jsonObject.put("productName", list.get(i).get("DESCRIPTION")); jsonObject.put("productName", list.get(i).get("DESCRIPTION"));
jsonObject.put("productStage", list.get(i).get("PHASE")); jsonObject.put("productStage", list.get(i).get("PHASE"));

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

@ -1955,7 +1955,7 @@ public class InvoiceController {
return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！");
} }
// } // }
} else if ("01".equals(shipRequestType) || "02".equals(shipRequestType)) {//领料 } else if ("01".equals(shipRequestType) || "02".equals(shipRequestType) || "06".equals(shipRequestType)) {//领料
if (dy0 < 0) {//只能超发一个 if (dy0 < 0) {//只能超发一个
return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！");
} }
@ -2139,7 +2139,7 @@ public class InvoiceController {
return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！");
} }
// } // }
} else if ("01".equals(shipRequestType)) {//领料 } else if ("01".equals(shipRequestType) || "02".equals(shipRequestType) || "06".equals(shipRequestType)) {//领料
if (dy0 < 0) {//只能超发一个 if (dy0 < 0) {//只能超发一个
return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！");
} }

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

@ -280,7 +280,7 @@ public class PurchaseReturnController {
return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！");
} }
// } // }
} else if ("01".equals(shipRequestType) || "02".equals(shipRequestType)) {//领料 } else if ("01".equals(shipRequestType) || "02".equals(shipRequestType) || "06".equals(shipRequestType)) {//领料
if (dy0 < 0) {//只能超发一个 if (dy0 < 0) {//只能超发一个
return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！");
} }

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

@ -354,7 +354,7 @@ public class SaleOutController {
return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！");
} }
// } // }
} else if ("01".equals(shipRequestType) || "02".equals(shipRequestType)) {//领料 } else if ("01".equals(shipRequestType) || "02".equals(shipRequestType) || "06".equals(shipRequestType)) {//领料 06成品中心领料
if ((allQty.subtract(minusQty)).compareTo(minQty)>0) {//只能超发一个 if ((allQty.subtract(minusQty)).compareTo(minQty)>0) {//只能超发一个
return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！");
} }
@ -567,7 +567,7 @@ public class SaleOutController {
return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！");
} }
// } // }
} else if ("01".equals(shipRequestType) || "02".equals(shipRequestType)) {//领料 } else if ("01".equals(shipRequestType) || "02".equals(shipRequestType) || "06".equals(shipRequestType)) {//领料
if (dy0 < 0) {//只能超发一个 if (dy0 < 0) {//只能超发一个
return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！"); return AjaxResult.me().setSuccess(false).setMessage("只能超发一个不能出库了！");
} }

13
zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java
View File

@ -569,7 +569,7 @@ public class InvoiceServiceImpl implements InvoiceService {
case "06"://成本中心领料 case "06"://成本中心领料
// billCode=toSAPService.orderStockOut(shipRequestName, "SDK", eventUser,materialPackingKeyList); // billCode=toSAPService.orderStockOut(shipRequestName, "SDK", eventUser,materialPackingKeyList);
billCode=orderStockOut(shipRequestName, "SDK", eventUser,materialPackingKeyList); // billCode=orderStockOut(shipRequestName, "SDK", eventUser,materialPackingKeyList,commitDate);
//抛送MES数据 //抛送MES数据
untils.sendMaterialInfoToMES_NEW(shipRequestName, "", materialPackingKeyList); untils.sendMaterialInfoToMES_NEW(shipRequestName, "", materialPackingKeyList);
//更新MES管芯数据 //更新MES管芯数据
@ -2271,7 +2271,7 @@ public class InvoiceServiceImpl implements InvoiceService {
return undoId; return undoId;
} }
public String orderStockOut(String shipRequestName, String siteName, String user,List<String> boxList) throws Exception { public String orderStockOut(String shipRequestName, String siteName, String user,List<String> boxList,String commitDate) throws Exception {
String rcode; String rcode;
String undoId = ""; String undoId = "";
@ -2352,10 +2352,15 @@ public class InvoiceServiceImpl implements InvoiceService {
*/ */
body.put("ITEM", itemArray); body.put("ITEM", itemArray);
body.put("ITEMID", uniqueID); body.put("ITEMID", uniqueID);
SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat outputFormat = new SimpleDateFormat("yyyyMMdd");
Date date = inputFormat.parse(commitDate);
String outputDate = outputFormat.format(date);
//过账日期 //过账日期
body.put("BUDAT", TimeStampUtil.getCurrentTime("yyyyMMdd")); body.put("BUDAT",outputDate);
//凭证日期 //凭证日期
body.put("BLDAT", TimeStampUtil.getCurrentTime("yyyyMMdd")); body.put("BLDAT", outputDate);
//凭证抬头文本 //凭证抬头文本
body.put("BKTXT", uniqueID); body.put("BKTXT", uniqueID);
//用户名 //用户名

2
zi-wms-pda/src/main/java/com/cim/idm/utils/CommonUtils.java
View File

@ -671,7 +671,7 @@ public void SaveUnDoInfo_ForSap(List<String> list, String undoid, EventInfo mak
// 定义SQL查询语句，用于获取物料接收位置和接收工厂信息 // 定义SQL查询语句，用于获取物料接收位置和接收工厂信息
String sql="SELECT m.ERPRECEIVELOCATION,m.ERPRECEIVEFACTORY FROM MATERIALSHIPREQUEST a,MATERIALSHIPREQUESTDETAIL m \r\n" + String sql="SELECT m.ERPRECEIVELOCATION,m.ERPRECEIVEFACTORY FROM MATERIALSHIPREQUEST a,MATERIALSHIPREQUESTDETAIL m \r\n" +
" WHERE m.SHIPREQUESTNAME =:SHIPREQUESTNAME and m.SHIPREQUESTNAME=a.SHIPREQUESTNAME " " WHERE m.SHIPREQUESTNAME =:SHIPREQUESTNAME and m.SHIPREQUESTNAME=a.SHIPREQUESTNAME "
+ " AND a.SHIPREQUESTDETAILTYPE in('311','261')"; + " AND a.SHIPREQUESTDETAILTYPE in('311','261','201')";
// 创建参数映射，用于执行SQL查询 // 创建参数映射，用于执行SQL查询
Map<String, Object> bp=new HashMap<>(); Map<String, Object> bp=new HashMap<>();
bp.put("SHIPREQUESTNAME", invoiceNo); bp.put("SHIPREQUESTNAME", invoiceNo);

2
zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml
View File

@ -167,7 +167,7 @@
#{name} #{name}
</foreach> </foreach>
AND m.SITENAME = #{siteName} AND m.SITENAME = #{siteName}
AND m.DELETEDETAILFLAG !='L' AND (m.DELETEDETAILFLAG IS NULL OR m.DELETEDETAILFLAG !='L')
AND m3.IS_BATCH != 'N' AND m3.IS_BATCH != 'N'
<!-- AND m2.RECEIVEREQUESTTYPE IN--> <!-- AND m2.RECEIVEREQUESTTYPE IN-->
<!-- <foreach item="type" index="index" collection="typeList" open="(" separator="," close=")">--> <!-- <foreach item="type" index="index" collection="typeList" open="(" separator="," close=")">-->