diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/AutoLibraryController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/AutoLibraryController.java index af62b9c..28b3958 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/AutoLibraryController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/AutoLibraryController.java @@ -86,7 +86,7 @@ public class AutoLibraryController { { //修改Materialpacking 信息 Map bindMap = new HashMap(); - bindMap.put("StockState","StockOut"); + bindMap.put("stockState","StockOut"); bindMap.put("areaName",""); bindMap.put("shipTime",new Timestamp(System.currentTimeMillis())); SetEventInfo setEventInfo = new SetEventInfo(); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/CacheWareController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/CacheWareController.java index fc4ff7b..0de736b 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/CacheWareController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/CacheWareController.java @@ -6,6 +6,8 @@ import com.cim.idm.response.BaseResponse; import com.cim.idm.response.RespGenerator; import com.cim.idm.utils.EventInfoUtil; import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.checkerframework.checker.index.qual.SameLen; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -25,8 +27,38 @@ import java.util.Map; @RestController @RequestMapping("/stockIn") @EnableAutoConfiguration +@Slf4j public class CacheWareController { + @RequestMapping(value = "/addNChargeNOrder", method = RequestMethod.POST) + public BaseResponse> editMaterial(@RequestBody Map params){ + log.info("CacheWareController addNChargeNOrder", params); + String sitename = (String)params.get("SITENAME"); + String userid = (String)params.get("USERID"); + String materialspecname = (String)params.get("MATERIALSPECNAME"); + LocalDateTime makedatet = LocalDateTime.now(); + Timestamp makedate = Timestamp.valueOf(makedatet); + + String materialquantity = (String)params.get("MATERIALQUANTITY"); + String erpfactory = (String)params.get("ERPFACTORY"); + String unit = (String)params.get("UNIT"); + String truegg = (String)params.get("TRUEGG"); + String remark = (String)params.get("REMARK"); + String is_sure = (String)params.get("IS_SURE"); + + + String sql = "INSERT INTO MATERIALCACHE (SITENAME,USERID,MATERIALSPECNAME, MAKEDATE,MATERIALQUANTITY,ERPFACTORY,UNIT,TRUEGG,REMARK,IS_SURE) \r\n" + + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + + Object[] args = new Object[]{sitename, userid, materialspecname, makedate, materialquantity, + erpfactory, unit, truegg, remark, is_sure }; + IDMFrameServiceProxy.getSqlTemplate().update(sql, args); + EventInfo eventInfo = new EventInfoUtil().makeEventInfo("addNChargeNOrder", userid, "addNChargeNOrder"); + + BaseResponse returnOK = RespGenerator.returnOK(params); + return returnOK; + } + @RequestMapping(value = "/checkNChargeNOrder", method = RequestMethod.POST) public BaseResponse> checkNChargeNOrder(@RequestBody Map params) throws ParseException { diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ChargeSplitServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ChargeSplitServiceImpl.java index 0823e29..1e99ccb 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ChargeSplitServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ChargeSplitServiceImpl.java @@ -154,7 +154,7 @@ public class ChargeSplitServiceImpl implements ChargeSplitService { bindMap.put("MaterialQuantity", boxList.get(1).getMaterialQuantity());// 数量 bindMap.put("PackingState", "Released"); bindMap.put("OldPackingState", "Released"); - bindMap.put("StockState", "Stocked"); + bindMap.put("stockState", "Stocked"); bindMap.put("OldStockState", "Created"); bindMap.put("HoldState", holdState); bindMap.put("LocationName", locationName); @@ -213,7 +213,7 @@ public class ChargeSplitServiceImpl implements ChargeSplitService { //更新原标签批次的库位状态为出库 MaterialPackingKey materialPackingKey = new MaterialPackingKey("SDK",boxList.get(0).getMaterialPackingName()); Map hashMap3 = new HashMap (); - hashMap3.put("StockState", "StockOut"); + hashMap3.put("stockState", "StockOut"); setEventInfo.setUserColumns(hashMap3); MaterialPackingServiceProxy.getMaterialPackingService().setEvent(materialPackingKey, makeEventInfo, setEventInfo); } @@ -347,7 +347,7 @@ public class ChargeSplitServiceImpl implements ChargeSplitService { bindMap.put("MaterialQuantity", StorageSpec.getMATERIALQUANTITY1());// 数量 bindMap.put("PackingState", "Released"); bindMap.put("OldPackingState", "Released"); - bindMap.put("StockState", "Stocked"); + bindMap.put("stockState", "Stocked"); bindMap.put("OldStockState", "Created"); bindMap.put("HoldState", holdState); bindMap.put("LocationName", locationName); @@ -400,7 +400,7 @@ public class ChargeSplitServiceImpl implements ChargeSplitService { bindMap2.put("MaterialQuantity", StorageSpec.getMATERIALQUANTITY2());// 数量 if(!locationNameCr.isEmpty() && locationNameCr.contains("现场仓")) { - bindMap2.put("StockState", "StockOut"); + bindMap2.put("stockState", "StockOut"); } createInfo2.setUserColumns(bindMap2); @@ -411,7 +411,7 @@ public class ChargeSplitServiceImpl implements ChargeSplitService { //更新原标签批次的库位状态为出库 MaterialPackingKey materialPackingKey = new MaterialPackingKey("SDK",StorageSpec.getMaterialPackingName()); Map hashMap3 = new HashMap (); - hashMap3.put("StockState", "StockOut"); + hashMap3.put("stockState", "StockOut"); setEventInfo.setUserColumns(hashMap3); MaterialPackingServiceProxy.getMaterialPackingService().setEvent(materialPackingKey, makeEventInfo, setEventInfo); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/HoldAndReleaseServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/HoldAndReleaseServiceImpl.java index 61076da..6a94d3a 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/HoldAndReleaseServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/HoldAndReleaseServiceImpl.java @@ -53,7 +53,7 @@ public class HoldAndReleaseServiceImpl implements HoldAndReleaseService { } Map bindMap = new HashMap(); bindMap.put("holdState", flag); - bindMap.put("lastHoldUser", userId); + bindMap.put("lastHoldUser", "Y".equals(flag) ? userId : ""); setEventInfo.setUserColumns(bindMap); MaterialPackingServiceProxy.getMaterialPackingService().setEvent(mpKeyList, eventInfo, setEventInfo); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MoveTransformServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MoveTransformServiceImpl.java index 1a091e0..983f936 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MoveTransformServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MoveTransformServiceImpl.java @@ -227,7 +227,7 @@ public class MoveTransformServiceImpl { hashMap.put("locationName", locationname); hashMap.put("SDK_ID", sdk_ID); hashMap.put("PHASE", phase); - hashMap.put("StockState", "Stocked"); + hashMap.put("stockState", "Stocked"); setEventInfo.setUserColumns(hashMap); MaterialPackingServiceProxy.getMaterialPackingService().setEvent(materialPacking.getKey(), makeEventInfo, setEventInfo); } @@ -250,7 +250,7 @@ public class MoveTransformServiceImpl { bindMap.put("MaterialQuantity", materialquantity);// 数量 bindMap.put("PackingState", "Released"); bindMap.put("OldPackingState", "Released"); - bindMap.put("StockState", "Stocked"); + bindMap.put("stockState", "Stocked"); bindMap.put("OldStockState", "Created"); bindMap.put("HoldState", holdState); bindMap.put("LocationName", locationname); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/OtherInServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/OtherInServiceImpl.java index 295664a..983f4ed 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/OtherInServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/OtherInServiceImpl.java @@ -90,7 +90,7 @@ public class OtherInServiceImpl implements OtherInService { bindMap.put("MaterialQuantity", qty);// 数量 bindMap.put("PackingState", "Released"); bindMap.put("OldPackingState", "Released"); - bindMap.put("StockState", "Created"); + bindMap.put("stockState", "Created"); bindMap.put("OldStockState", "Created"); bindMap.put("HoldState", "N"); // bindMap.put("AreaName", queryForList.get(0).get("AREANAME")); @@ -153,7 +153,7 @@ public class OtherInServiceImpl implements OtherInService { SetEventInfo setEventInfo = new SetEventInfo(); Map bindMap = new HashMap(); bindMap.put("unDoID", billCode); - bindMap.put("StockState", "Stocked"); + bindMap.put("stockState", "Stocked"); setEventInfo.setUserColumns(bindMap); MaterialPackingServiceProxy.getMaterialPackingService().setEvent(materialPackingKey, makeEventInfo, setEventInfo); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java index b67b8b5..11b4ebf 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java @@ -411,7 +411,7 @@ public class ProductIntoServiceImpl implements FGStockInService { bindMap.put("MaterialQuantity", queryForList.get(0).get("MATERIALQUANTITY"));// 数量 bindMap.put("PackingState", "Released"); bindMap.put("OldPackingState", "Released"); - bindMap.put("StockState", "Created"); + bindMap.put("stockState", "Created"); bindMap.put("OldStockState", "Created"); bindMap.put("HoldState", "N"); bindMap.put("areaName", areaName); @@ -527,7 +527,7 @@ public class ProductIntoServiceImpl implements FGStockInService { SetEventInfo setEventInfo = new SetEventInfo(); Map bindMap = new HashMap(); bindMap.put("unDoID", billCode); - //bindMap.put("StockState", "Stocked"); + //bindMap.put("stockState", "Stocked"); setEventInfo.setUserColumns(bindMap); MaterialPackingServiceProxy.getMaterialPackingService().setEvent(materialPackingKey, makeEventInfo, setEventInfo); @@ -723,7 +723,7 @@ public class ProductIntoServiceImpl implements FGStockInService { SetEventInfo setEventInfo = new SetEventInfo(); Map bindMap = new HashMap(); bindMap.put("unDoID", billCode); - bindMap.put("StockState", "Stocked"); + bindMap.put("stockState", "Stocked"); setEventInfo.setUserColumns(bindMap); MaterialPackingServiceProxy.getMaterialPackingService().setEvent(materialPackingKey, makeEventInfo, setEventInfo); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ReturnStockIntoServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ReturnStockIntoServiceImpl.java index d0c1387..14f2fc0 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ReturnStockIntoServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ReturnStockIntoServiceImpl.java @@ -382,7 +382,7 @@ public class ReturnStockIntoServiceImpl implements ReturnStockInService { bindMap.put("MaterialQuantity", queryForList.get(0).get("MATERIALQUANTITY"));// 数量 bindMap.put("PackingState", "Released"); bindMap.put("OldPackingState", "Released"); - bindMap.put("StockState", "Created"); + bindMap.put("stockState", "Created"); bindMap.put("OldStockState", "Created"); bindMap.put("truegg", queryForList.get(0).get("TRUEGG")); bindMap.put("HoldState", "N"); @@ -455,7 +455,7 @@ public class ReturnStockIntoServiceImpl implements ReturnStockInService { bindMap.put("MaterialQuantity", queryForList.get(0).get("MATERIALQUANTITY"));// 数量 bindMap.put("PackingState", "Released"); bindMap.put("OldPackingState", "Released"); - bindMap.put("StockState", "Created"); + bindMap.put("stockState", "Created"); bindMap.put("SDK_ID", queryForList.get(0).get("SDK_ID")); bindMap.put("PHASE", queryForList.get(0).get("PHASE")); bindMap.put("unit", queryForList.get(0).get("UNIT")); @@ -565,7 +565,7 @@ public class ReturnStockIntoServiceImpl implements ReturnStockInService { SetEventInfo setEventInfo = new SetEventInfo(); Map bindMap = new HashMap(); bindMap.put("unDoID", billCode); - bindMap.put("StockState", "Stocked"); + bindMap.put("stockState", "Stocked"); setEventInfo.setUserColumns(bindMap); MaterialPackingServiceProxy.getMaterialPackingService().setEvent(materialPackingKey, makeEventInfo, setEventInfo); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/SDKMaterialPackingServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/SDKMaterialPackingServiceImpl.java index c422661..7a402b1 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/SDKMaterialPackingServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/SDKMaterialPackingServiceImpl.java @@ -67,7 +67,7 @@ public class SDKMaterialPackingServiceImpl extends CommonServiceDAO hashMap3 = new HashMap<>(); hashMap3.put("PackingState", "Released"); hashMap3.put("OldPackingState", "Released"); - hashMap3.put("StockState", "Stocked"); + hashMap3.put("stockState", "Stocked"); hashMap3.put("OldStockState", "StockOut"); hashMap3.put("DurableName", durableName); hashMap3.put("AreaName", areaName); @@ -100,7 +100,7 @@ public class SDKMaterialPackingServiceImpl extends CommonServiceDAO map : queryForList) { bindMap.put("packingState","Released"); - bindMap.put("StockState","Stocked"); + bindMap.put("stockState","Stocked"); bindMap.put("unDoID",UNDOID); setEventInfo.setUserColumns(bindMap); MaterialPackingKey materialPackingKey = new MaterialPackingKey(map.get("SITENAME").toString(), map.get("MATERIALPACKINGNAME").toString()); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/SaleReturnServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/SaleReturnServiceImpl.java index 1f3fb3b..2607049 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/SaleReturnServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/SaleReturnServiceImpl.java @@ -228,7 +228,7 @@ public class SaleReturnServiceImpl implements SaleReturnService { for (MaterialPacking materialPacking : MaterialPackingList) { //更新批次，数量，库位状态 Map hashMap = new HashMap (); - hashMap.put("StockState", "Stocked"); + hashMap.put("stockState", "Stocked"); hashMap.put("shipRequestName", ""); hashMap.put("shipRequestDetailName", ""); hashMap.put("unDoID", billCode); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/TransferInServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/TransferInServiceImpl.java index 385379b..6e4eec6 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/TransferInServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/TransferInServiceImpl.java @@ -239,7 +239,7 @@ public class TransferInServiceImpl implements TransferInService { for (MaterialPacking materialPacking : MaterialPackingList) { //更新批次，数量，库位状态 Map hashMap = new HashMap (); - hashMap.put("StockState", "Stocked"); + hashMap.put("stockState", "Stocked"); hashMap.put("shipRequestName", ""); hashMap.put("shipRequestDetailName", ""); // hashMap.put("commitDate",commitDate); @@ -415,7 +415,7 @@ public class TransferInServiceImpl implements TransferInService { SetEventInfo setEventInfo = new SetEventInfo(); //更新批次，数量，库位状态 Map hashMap = new HashMap (); - hashMap.put("StockState", "Stocked"); + hashMap.put("stockState", "Stocked"); hashMap.put("shipRequestName", ""); hashMap.put("shipRequestDetailName", ""); // hashMap.put("commitDate",commitDate); diff --git a/zi-wms-service/src/main/java/com/cim/idm/mwmsextend/materialpacking/service/MaterialPackingServiceImpl.java b/zi-wms-service/src/main/java/com/cim/idm/mwmsextend/materialpacking/service/MaterialPackingServiceImpl.java index 8e080f5..9e01323 100644 --- a/zi-wms-service/src/main/java/com/cim/idm/mwmsextend/materialpacking/service/MaterialPackingServiceImpl.java +++ b/zi-wms-service/src/main/java/com/cim/idm/mwmsextend/materialpacking/service/MaterialPackingServiceImpl.java @@ -2963,7 +2963,7 @@ public void updateComplete(EventInfo eventInfo,String siteName,String invoiceNo, bindMap.put("MaterialQuantity", quantity);// 数量 bindMap.put("PackingState", fmp.getPackingState()); bindMap.put("OldPackingState", fmp.getOldStockState()); - bindMap.put("StockState", fmp.getStockState()); + bindMap.put("stockState", fmp.getStockState()); bindMap.put("OldStockState", fmp.getOldStockState()); bindMap.put("HoldState", fmp.getHoldState()); bindMap.put("AreaName", fmp.getAreaName()); @@ -6012,7 +6012,7 @@ public void updateComplete(EventInfo eventInfo,String siteName,String invoiceNo, bindMap.put("PackingState", materialPackingData.getPackingState()); bindMap.put("OldPackingState", materialPackingData.getOldStockState()); - bindMap.put("StockState", materialPackingData.getStockState()); + bindMap.put("stockState", materialPackingData.getStockState()); bindMap.put("OldStockState", materialPackingData.getOldStockState()); //B9&B17对于pcb拆分，拆分后hold，手动解除 if((siteName.equals("B9")||siteName.equals("B17"))&&materialPackingData.getMaterialSpecName().startsWith("44-977")){ @@ -6148,7 +6148,7 @@ public void updateComplete(EventInfo eventInfo,String siteName,String invoiceNo, bindMap.put("PackingState", materialPackingData.getPackingState()); bindMap.put("OldPackingState", materialPackingData.getOldStockState()); - bindMap.put("StockState", materialPackingData.getStockState()); + bindMap.put("stockState", materialPackingData.getStockState()); bindMap.put("OldStockState", materialPackingData.getOldStockState()); bindMap.put("HoldState", materialPackingData.getHoldState()); bindMap.put("AreaName", materialPackingData.getAreaName()); @@ -7474,7 +7474,7 @@ public void updateComplete(EventInfo eventInfo,String siteName,String invoiceNo, bindMap.put("PackingState",materialPackingData.getPackingState() ); bindMap.put("OldPackingState", materialPackingData.getOldStockState()); - bindMap.put("StockState", materialPackingData.getStockState()); + bindMap.put("stockState", materialPackingData.getStockState()); bindMap.put("OldStockState", materialPackingData.getOldStockState()); //B9对于pcb拆分，拆分后hold，手动解除 if(siteName.equals("B9")&&materialPackingData.getMaterialSpecName().startsWith("44-977")){ @@ -7636,7 +7636,7 @@ public void updateComplete(EventInfo eventInfo,String siteName,String invoiceNo, bindMap.put("PackingState",materialPackingData.getPackingState() ); bindMap.put("OldPackingState", materialPackingData.getOldStockState()); - bindMap.put("StockState", materialPackingData.getStockState()); + bindMap.put("stockState", materialPackingData.getStockState()); bindMap.put("OldStockState", materialPackingData.getOldStockState()); bindMap.put("HoldState", materialPackingData.getHoldState()); bindMap.put("AreaName", materialPackingData.getAreaName()); @@ -7791,7 +7791,7 @@ public void updateComplete(EventInfo eventInfo,String siteName,String invoiceNo, bindMap.put("PackingState",materialPackingData.getPackingState() ); bindMap.put("OldPackingState", materialPackingData.getOldStockState()); - bindMap.put("StockState", materialPackingData.getStockState()); + bindMap.put("stockState", materialPackingData.getStockState()); bindMap.put("OldStockState", materialPackingData.getOldStockState()); bindMap.put("HoldState", materialPackingData.getHoldState()); bindMap.put("AreaName", materialPackingData.getAreaName()); diff --git a/zi-wms-service/src/main/java/com/cim/idm/mwmsextend/materialpackingstockin/service/MaterialPackingStockInImpl.java b/zi-wms-service/src/main/java/com/cim/idm/mwmsextend/materialpackingstockin/service/MaterialPackingStockInImpl.java index 3588043..f429c63 100644 --- a/zi-wms-service/src/main/java/com/cim/idm/mwmsextend/materialpackingstockin/service/MaterialPackingStockInImpl.java +++ b/zi-wms-service/src/main/java/com/cim/idm/mwmsextend/materialpackingstockin/service/MaterialPackingStockInImpl.java @@ -3059,7 +3059,7 @@ public void checkETCState( String materialpackingName)throws Exception { materialPackingKey.setMaterialPackingName(PalletList.get(i).get("MATERIALPACKINGNAME").toString()); materialPackingKey.setSiteName(siteName); bindMap.put("packingState","Released"); - bindMap.put("StockState","Stocked"); + bindMap.put("stockState","Stocked"); bindMap.put("materialProcessGroupName",PalletList.get(i).get("MATERIALPROCESSGROUPNAME")==null?"":PalletList.get(i).get("MATERIALPROCESSGROUPNAME").toString()); bindMap.put("packingGrade",PalletList.get(i).get("PACKINGGRADE")==null?"":PalletList.get(i).get("PACKINGGRADE").toString()); setEventInfo.setUserColumns(bindMap); @@ -3101,7 +3101,7 @@ public void checkETCState( String materialpackingName)throws Exception { materialPackingKey.setMaterialPackingName(PalletList.get(i).get("MATERIALPACKINGNAME").toString()); materialPackingKey.setSiteName(siteName); bindMap.put("packingState","Completed"); - bindMap.put("StockState","StockOut"); + bindMap.put("stockState","StockOut"); //bindMap.put("materialProcessGroupName",PalletList.get(i).get("MATERIALPROCESSGROUPNAME")==null?"":PalletList.get(i).get("MATERIALPROCESSGROUPNAME").toString()); //bindMap.put("packingGrade",PalletList.get(i).get("PACKINGGRADE")==null?"":PalletList.get(i).get("PACKINGGRADE").toString()); setEventInfo.setUserColumns(bindMap); @@ -3800,7 +3800,7 @@ public List GetOQAList(List informatio bindMap.put("PackingState", materialPackingData.getPackingState()); bindMap.put("OldPackingState", materialPackingData.getOldStockState()); - bindMap.put("StockState", materialPackingData.getStockState()); + bindMap.put("stockState", materialPackingData.getStockState()); bindMap.put("OldStockState", materialPackingData.getOldStockState()); bindMap.put("HoldState", materialPackingData.getHoldState()); bindMap.put("AreaName", materialPackingData.getAreaName());