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

fix:修改备货出库

Browse Source
This commit is contained in:
郭飞 2025-04-24 08:37:18 +08:00
parent 00214095e4
commit 609e642d03
3 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,7 +217,7 @@ public class MESServiceImpl implements MESService{
+ " ORDER BY m5.USEDATE,m5.SHIPREQUESTDETAILNAME FETCH FIRST ROW ONLY)WO,:SHIPREQUESTNAME \r\n"
+ " FROM MATERIALPACKING m ,MATERIALSPEC m2 ,MATERIALSHIPREQUEST m3 ,BS_MATERIALDESCRIPTION m4 ,BS_MATERIALUNIT bm \r\n"
+ " WHERE m.SITENAME =:SITENAME \r\n"
+ " AND m.SHIPREQUESTNAME =:SHIPREQUESTNAME \r\n"
+ " AND m.SHIPREQUESTNAME =:SHIPREQUESTNAME AND m.MATERIALPACKINGNAME =:MATERIALPACKINGNAME \r\n"
+ " AND (m.RECEIVEACTNO =:RECEIVEACTNO OR :RECEIVEACTNO IS NULL ) \r\n"
+ " AND m.MATERIALSPECNAME =m2.MATERIALSPECNAME \r\n"
+ " AND m.SHIPREQUESTNAME =m3.SHIPREQUESTNAME \r\n"
@ -226,6 +226,7 @@ public class MESServiceImpl implements MESService{
+ " AND m.FUNIT =bm.ADDITIONALUNIT(+) AND m.STOCKSTATE = 'Stocked'";
hashMap.put("QTY", qty);
hashMap.put("MATERIALPACKINGNAME", boxid);
IDMFrameServiceProxy.getSqlTemplate().update(sqli, hashMap);
}
@ -326,9 +327,8 @@ public class MESServiceImpl implements MESService{
" WHERE m.MATERIALPACKINGNAME =:MATERIALPACKINGNAME)";
IDMFrameServiceProxy.getSqlTemplate().update(sqlu, bps);
}
hashMap.put("QTY", qty);
}
String sqli = "INSERT INTO MATERIALPACKINGMDC(MATERIALPACKINGNAME,CHARGE,MATERIALSPECNAME,EXPIRINGDATE,PHASE, \r\n"
+ " TRUEGG ,MATERIALQUANTITY ,FQTY ,FUNIT ,LASTEVENTUSER ,REMARK , \r\n"
+ " SHIPREQUESTDETAILTYPE ,MATERIALUNIT ,CONVERSIONSCALE, \r\n"
@ -342,7 +342,7 @@ public class MESServiceImpl implements MESService{
+ " ORDER BY m5.USEDATE,m5.SHIPREQUESTDETAILNAME FETCH FIRST ROW ONLY)WO,:SHIPREQUESTNAME \r\n"
+ " FROM MATERIALPACKING m ,MATERIALSPEC m2 ,MATERIALSHIPREQUEST m3 ,BS_MATERIALDESCRIPTION m4 ,BS_MATERIALUNIT bm \r\n"
+ " WHERE m.SITENAME =:SITENAME \r\n"
+ " AND m.SHIPREQUESTNAME =:SHIPREQUESTNAME \r\n"
+ " AND m.SHIPREQUESTNAME =:SHIPREQUESTNAME AND m.MATERIALPACKINGNAME =:MATERIALPACKINGNAME\r\n"
+ " AND (m.RECEIVEACTNO =:RECEIVEACTNO OR :RECEIVEACTNO IS NULL ) \r\n"
+ " AND m.MATERIALSPECNAME =m2.MATERIALSPECNAME \r\n"
+ " AND m.SHIPREQUESTNAME =m3.SHIPREQUESTNAME \r\n"
@ -350,8 +350,13 @@ public class MESServiceImpl implements MESService{
+ " AND m.MATERIALSPECNAME =bm.MATERIALSPECNAME(+) \r\n"
+ " AND m.FUNIT =bm.ADDITIONALUNIT(+) AND m.STOCKSTATE = 'Stocked'";
hashMap.put("QTY", qty);
hashMap.put("MATERIALPACKINGNAME", boxid);
IDMFrameServiceProxy.getSqlTemplate().update(sqli, hashMap);
}
return code;
}

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

@ -144,7 +144,6 @@ public class ERPLocationMoveNoInvoiceServiceImpl implements ERPLocationMoveNoInv
bindSet = new String[]{storageSpec.getMaterialPackingName()};
}
List<MaterialPacking> MaterialPackingList = MaterialPackingServiceProxy.getMaterialPackingService().select(condition, bindSet);
all.addAll(MaterialPackingList);
//解析条码,根据远条码信息更新目标条码数量和库存状态

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

@ -344,11 +344,11 @@ public class InvoiceServiceImpl implements InvoiceService {
str += "'" + materialPacking + "',";
}
str += "'')";
Object[] bindSet = {};
// Object[] bindSet = {};
// List<Map<String, Object>> queryForList2 = IDMFrameServiceProxy.getSqlTemplate().queryForList(cklx.toString() + str, hashMap);
// 查询MATERIALQUANTITY 与 MATERIALQUANTITY2是否相等，如果相等则未修改数量，不相等则修改数量
List<Map<String, Object>> qtyQueryForList = IDMFrameServiceProxy.getSqlTemplate().queryForList(cklx.toString() + str, hashMap);
List<Map<String, Object>> qtyQueryForList1 = IDMFrameServiceProxy.getSqlTemplate().queryForList(cklx.toString() + str, hashMap);
// List<MaterialPacking> qtyQueryForList = MaterialPackingServiceProxy.getMaterialPackingService().select(cklx.toString() + str, bindSet,MaterialPacking.class);
String billCode = "";
@ -387,9 +387,12 @@ public class InvoiceServiceImpl implements InvoiceService {
// 查询MATERIALQUANTITY 与 MATERIALQUANTITY2是否相等，如果相等则未修改数量，不相等则修改数量
// 如果已修改数量，则进行拆单
// for (int z = 0; z < qtyQueryForList.size(); z++) {
//
// String qty = String.valueOf(qtyQueryForList.get(z).getMaterialQuantity());
// for (int z = 0; z < qtyQueryForList1.size(); z++) {
// String MATERIALPACKINGNAME = qtyQueryForList1.get(z).get("MATERIALPACKINGNAME").toString();
// Object[] bindSet = {MATERIALPACKINGNAME};
// String qtysql = "SELECT * FROM MATERIALPACKING m WHERE m.MATERIALPACKINGNAME = ?";
// List<MaterialPacking> qtyQueryForList = MaterialPackingServiceProxy.getMaterialPackingService().select(qtysql, bindSet);
// String qty = String.valueOf(qtyQueryForList.get(z).getMaterialQuantity());`
//
// String qty2 = new Double(qtyQueryForList.get(z).getMaterialQuantity2()) == null ? "0" : String.valueOf(qtyQueryForList.get(z).getMaterialQuantity2());
// String materialPackingName = qtyQueryForList.get(z).getMaterialPackingName();