diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java index 95b70f8b..062d96f3 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java @@ -92,7 +92,7 @@ public interface WmsProductPutMapper { public List selectWmsProductPutSAPByIds(@Param("id")String id); - public WmsProductPut selectWmsProductPutByIdANDStatus(String id); + public WmsProductPut selectWmsProductPutByIdANDStatus(@Param("id")String id); // String selectProOrderWorkorder(WmsProductPut wmsProductPut1); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index 271fb88d..d7a3cd81 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -1298,25 +1298,28 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { String result="操作成功"; for (WmsProductPut wmsProductPut: wmsProductPutList){ - WmsProductPut wmsProductPut1= wmsProductPutMapper.selectWmsProductPutByIdANDStatus(wmsProductPut.getId()); -// //LFBJA 参考凭证会计年度 -// //LFBNR 参考凭证的凭证号 -// //LFPOS 参考凭证项目 -// //EBELN 采购凭证号 -// //EBELP 采购凭证的项目编号 -// //MATNR 物料号 -// //QUANTITY 数量 -// //WERKS 工厂 -// //LGORT 库存地点 +// WmsProductPut wmsProductPut1= wmsProductPutMapper.selectWmsProductPutByIdANDStatus(wmsProductPut.getId()); +// //LFBJA +// //LFBNR +// //LFPOS +// //EBELN +// //EBELP +// //MATNR +// //QUANTITY +// //WERKS +// //LGORT // //这个地方 // Map paramMap=new HashMap<>(); // List mapList = new ArrayList<>(); -// paramMap.put("S_MBLNR",wmsRawOrderIn.getUserDefined1()); -// paramMap.put("S_MJAHR",wmsRawOrderIn.getUserDefined2()); -// paramMap.put("S_MATNR",wmsRawOrderIn.getMaterialCode()); -// paramMap.put("incomeBatchNo",wmsRawOrderIn.getIncomeBatchNo()); //批次 -// paramMap.put("ebelp",wmsRawOrderIn.getPoLine()); -// paramMap.put("poNo",wmsRawOrderIn.getPoNo()); +// paramMap.put("LFBJA",wmsProductPut1.getAttr10());//参考凭证会计年度 +// paramMap.put("LFBNR",wmsProductPut1.getSapProof());//参考凭证的凭证号 +// //paramMap.put("LFPOS",wmsProductPut1.get());//参考凭证项目 +// paramMap.put("EBELN",wmsProductPut1.getProductCode());//采购凭证号 +// paramMap.put("EBELP",wmsProductPut1.getPoLine());//采购凭证的项目编号 +// paramMap.put("MATNR",wmsProductPut1.getPoNo());//物料号 +// paramMap.put("QUANTITY",wmsProductPut1.getPoNo());//数量 +// paramMap.put("WERKS",wmsProductPut1.getPoNo());//工厂 +// paramMap.put("LGORT",wmsProductPut1.getPoNo());//库存地点 // mapList.add(paramMap); // R result2 = remoteSapService.handleUpdateSAP102(mapList); // if (result2.getCode()==200){ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java index a26e5c2e..4896e75d 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java @@ -178,13 +178,13 @@ public class WmsSellOutEmbryoServiceImpl implements IWmsSellOutEmbryoService { BigDecimal planQuantity = wmsSellOutEmbryo1.getPlanQuantity(); List wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectwmsFpStorageNewsGroupWaCode(productCode); if (wmsFpStorageNewsSns.size()<1){ - return "无库存"; + return productCode+"无库存"; } + String stock= wmsSellOutEmbryoMapper.selectwmsFpStorageNewsTS(formattedDate); //区分大小planQuantity for ( WmsFpStorageNewsSn wmsFpStorageNewsSn: wmsFpStorageNewsSns){ BigDecimal tem= wmsFpStorageNewsSn.getAmount();//数量 //planQuantity看成总数量 - String stock= wmsSellOutEmbryoMapper.selectwmsFpStorageNewsTS(formattedDate); if(planQuantity.compareTo(tem)<=0){ //生成一个 wmsSellOutEmbryo1.setStockOrder("BH"+stock); @@ -192,7 +192,7 @@ public class WmsSellOutEmbryoServiceImpl implements IWmsSellOutEmbryoService { wmsSellOutEmbryo1.setPlanQuantity(planQuantity); wmsSellOutEmbryo1.setId(IdUtils.fastSimpleUUID()); wmsSellOutEmbryoMapper.insertWmsSellOutEmbryoOrder(wmsSellOutEmbryo1); - return result; + return result; }else { wmsSellOutEmbryo1.setStockOrder("BH"+stock); planQuantity = planQuantity.subtract(tem); // 用总数量减去tem,更新planQuantity的值 diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml index 155daf2b..e74091db 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml @@ -521,6 +521,6 @@ diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml index 55521a71..2d082062 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml @@ -286,7 +286,7 @@ and attr9 = #{attr9} and attr10 = #{attr10} - ORDER BY create_time DESC + ORDER BY stock_order DESC