diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java index dab56a67..b9dc8f48 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java @@ -4,7 +4,9 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.op.wms.domain.OdsProcureOrder; +import com.op.wms.domain.WmsProductPut; import com.op.wms.service.IOdsProcureOrderService; +import com.op.wms.service.IWmsProductPutService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -40,6 +42,9 @@ public class WmsRawOrderInController extends BaseController { @Autowired private IOdsProcureOrderService odsProcureOrderService; + @Autowired + private IWmsProductPutService wmsProductPutService; + /** * 查询包材到货单列表 */ @@ -117,8 +122,9 @@ public class WmsRawOrderInController extends BaseController { return success(result); } @PostMapping("/handleUpdateSAP102") - public AjaxResult handleUpdateSAP102(@RequestBody List odsProcureOrder) { - String result = odsProcureOrderService.handleUpdateSAP102(odsProcureOrder); + public AjaxResult handleUpdateSAP102(@RequestBody List wmsProductPutList) { + // String result =null; + String result = wmsProductPutService.handleUpdateSAP102(wmsProductPutList); return success(result); } } 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 cfdb4584..95b70f8b 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 @@ -72,25 +72,27 @@ public interface WmsProductPutMapper { public WmsProductPut selectWmsProductPutSAPById(String id); - List getReportList(wmsReportWork mesReportWork); + public List getReportList(wmsReportWork mesReportWork); - List selectWmsProductPutSAPByProDuct(String productOrder); + public List selectWmsProductPutSAPByProDuct(String productOrder); - void updateWmsProductPutByIds(@Param("wmsProductPut") WmsProductPut wmsProductPut4, @Param("list") List wmsProductPut2); + public void updateWmsProductPutByIds(@Param("wmsProductPut") WmsProductPut wmsProductPut4, @Param("list") List wmsProductPut2); - WmsProductPut WmsProductPutByWorkOrderqueryBS(WmsProductPut wmsProductPut); + public WmsProductPut WmsProductPutByWorkOrderqueryBS(WmsProductPut wmsProductPut); - WmsProductPut selectProOrderWorkorderBatchPallet(WmsProductPut wmsProductPut); + public WmsProductPut selectProOrderWorkorderBatchPallet(WmsProductPut wmsProductPut); - WmsProductPut selectProOrderWorkorderBatchPalletcode(WmsProductPut wmsProductPut); + public WmsProductPut selectProOrderWorkorderBatchPalletcode(WmsProductPut wmsProductPut); - WmsProductPut selectProOrderWorkorderBatchPalletAtter(ProOrderWorkorder proOrderWorkorder); + public WmsProductPut selectProOrderWorkorderBatchPalletAtter(ProOrderWorkorder proOrderWorkorder); - void updateProOrderWorkorderBatchPallet(@Param("palletCode")String sn); + public void updateProOrderWorkorderBatchPallet(@Param("palletCode")String sn); - void updateWmsProductStatus(WmsProductPut wmsProductPut2); + public void updateWmsProductStatus(WmsProductPut wmsProductPut2); - List selectWmsProductPutSAPByIds(@Param("id")String id); + public List selectWmsProductPutSAPByIds(@Param("id")String id); + + public WmsProductPut selectWmsProductPutByIdANDStatus(String id); // String selectProOrderWorkorder(WmsProductPut wmsProductPut1); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java index e5b76744..4a73bf75 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java @@ -95,4 +95,8 @@ public interface WmsSellOutEmbryoMapper { List selectWmsSellOutEmbryoListTS(WmsSellOutEmbryo wmsSellOutEmbryo); List selectWmsSellOutEmbryoREListTS(WmsSellOutEmbryo wmsSellOutEmbryo); + + public int insertWmsSellOutEmbryoOrder(WmsSellOutEmbryo wmsSellOutEmbryo); + + public String selectwmsFpStorageNewsTS(String formattedDate); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java index 167a24fb..8e5a7798 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java @@ -154,5 +154,5 @@ public interface IOdsProcureOrderService { String upbatCardXNew(OdsProcureOrder order); - String handleUpdateSAP102(List odsProcureOrder); + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java index 841d6fcc..e0d019dd 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java @@ -146,4 +146,6 @@ public interface IWmsProductPutService { String WmsProductPutByWorkOrderConfirmT(WmsProductPut wmsProductPutList); List selectQueryFinishedProductSalesTS(WmsSellOutEmbryo wmsSellOutEmbryo); + + String handleUpdateSAP102(List wmsProductPutList); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index b354accd..6993b06e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -1566,71 +1566,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { return result; } - @Override - public String handleUpdateSAP102(List odsProcureOrders) { - String result="操作成功"; - for (OdsProcureOrder order: odsProcureOrders){ - OdsProcureOrder odsProcureOrder = order; - WmsRawOrderIn wmsRawOrderIn= wmsRawOrderInMapper.selectWmsRawOrderInByRawOrderInIdThress(odsProcureOrder.getID()); - //这个地方 - 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()); - mapList.add(paramMap); - R result2 = remoteSapService.handleUpdateSAP102(mapList); - if (result2.getCode()==200){ - Map map = new HashMap(); - map = (Map) result2.getData(); - String MATERIALDOCUMENT = (String) map.get("MATERIALDOCUMENT"); - String MATDOCUMENTYEAR = (String) map.get("MATDOCUMENTYEAR"); - //成功了--成功了,根据 - WmsRawOrderInSn wmsRawOrderInSn=new WmsRawOrderInSn(); - wmsRawOrderInSn.setUserDefined5(wmsRawOrderIn.getDnNo()); - wmsRawOrderInSn.setUserDefined1("1");//暂收 - - wmsRawOrderInSn.setUserDefined3(wmsRawOrderIn.getKem()); - List wmsRawOrderInSnList= wmsRawOrderInSnMapper.selectWmsRawOrderInSnList(wmsRawOrderInSn); - for (WmsRawOrderInSn wmsRawOrderInSn1: - wmsRawOrderInSnList) { - WmsOdsMateStorageNewsSn wmsRawOrderInNewsSn=new WmsOdsMateStorageNewsSn(); - wmsRawOrderInNewsSn.setMaterialCode(wmsRawOrderInSn1.getMaterialCode()); - wmsRawOrderInNewsSn.setWaCode(wmsRawOrderInSn1.getWaCode()); - wmsRawOrderInNewsSn.setWhCode(wmsRawOrderInSn1.getWhCode()); - wmsRawOrderInNewsSn.setWlCode(wmsRawOrderInSn1.getWlCode()); - wmsRawOrderInNewsSn.setUserDefined3("1"); - wmsOdsMateStorageNewsSnMapper.updateWmsOdsMateStorageNewsSnTWM(wmsRawOrderInNewsSn); - wmsRawOrderInSn1.setUserDefined1("2"); - wmsRawOrderInSnMapper.updateWmsRawOrderInSn(wmsRawOrderInSn1); - WmsOdsMateStorageNews wmsOdsMateStorageNews=new WmsOdsMateStorageNews(); - wmsOdsMateStorageNews.setMaterialCode(wmsRawOrderInSn1.getMaterialCode()); - wmsOdsMateStorageNews.setWaCode(wmsRawOrderInSn1.getWaCode()); - wmsOdsMateStorageNews.setWlCode(wmsRawOrderInSn1.getWlCode()); - wmsOdsMateStorageNews.setWhCode(wmsRawOrderInSn1.getWhCode()); - wmsOdsMateStorageNews.setStorageAmount(wmsRawOrderInSn1.getAmount()); - wmsOdsMateStorageNewsMapper.updateWmsOdsMateStorageNewsUpdateStorageAmount(wmsOdsMateStorageNews); - } - wmsRawOrderIn.setOrderStatus("1"); - wmsRawOrderIn.setAccountingTime(new Date()); - wmsRawOrderIn.setAccountingMessage(result2.getMsg()); - wmsRawOrderIn.setUserDefined4(MATERIALDOCUMENT); - wmsRawOrderIn.setUserDefined5(MATDOCUMENTYEAR); - wmsRawOrderInMapper.updateWmsRawOrderIn(wmsRawOrderIn); - }else { - //失败了 - wmsRawOrderIn.setAccountingTime(new Date()); - wmsRawOrderIn.setAccountingMessage(result2.getMsg()); - wmsRawOrderInMapper.updateWmsRawOrderIn(wmsRawOrderIn); - - } - } - return result; - } @Override @DS("#header.poolName") 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 6f361bf3..44433319 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 @@ -1262,6 +1262,86 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { return wmsSellOutEmbryoList; } + /** + * LFBJA NUMC 4 0 参考凭证会计年度 必填 + * LFBNR CHAR 10 0 参考凭证的凭证号 必填 + * LFPOS NUMC 4 0 参考凭证项目 必填 + * EBELN CHAR 10 0 采购凭证号 必填 + * EBELP NUMC 5 0 采购凭证的项目编号 必填 + * MATNR CHAR 18 0 物料号 必填 + * QUANTITY QUAN 13 3 数量 必填 + * WERKS CHAR 4 0 工厂 必填 + * LGORT CHAR 4 0 库存地点 必填 + * @param wmsProductPutList + * @return + */ + @Override + @DS("#header.poolName") + public String handleUpdateSAP102(List wmsProductPutList) { + String result="操作成功"; + + for (WmsProductPut wmsProductPut: wmsProductPutList){ +// WmsProductPut wmsProductPut1= wmsProductPutMapper.selectWmsProductPutByIdANDStatus(wmsProductPut.getId()); +// +// //这个地方 +// 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()); +// mapList.add(paramMap); +// R result2 = remoteSapService.handleUpdateSAP102(mapList); +// if (result2.getCode()==200){ +// Map map = new HashMap(); +// map = (Map) result2.getData(); +// String MATERIALDOCUMENT = (String) map.get("MATERIALDOCUMENT"); +// String MATDOCUMENTYEAR = (String) map.get("MATDOCUMENTYEAR"); +// //成功了--成功了,根据 +// WmsRawOrderInSn wmsRawOrderInSn=new WmsRawOrderInSn(); +// wmsRawOrderInSn.setUserDefined5(wmsRawOrderIn.getDnNo()); +// wmsRawOrderInSn.setUserDefined1("1");//暂收 +// +// wmsRawOrderInSn.setUserDefined3(wmsRawOrderIn.getKem()); +// List wmsRawOrderInSnList= wmsRawOrderInSnMapper.selectWmsRawOrderInSnList(wmsRawOrderInSn); +// for (WmsRawOrderInSn wmsRawOrderInSn1: +// wmsRawOrderInSnList) { +// WmsOdsMateStorageNewsSn wmsRawOrderInNewsSn=new WmsOdsMateStorageNewsSn(); +// wmsRawOrderInNewsSn.setMaterialCode(wmsRawOrderInSn1.getMaterialCode()); +// wmsRawOrderInNewsSn.setWaCode(wmsRawOrderInSn1.getWaCode()); +// wmsRawOrderInNewsSn.setWhCode(wmsRawOrderInSn1.getWhCode()); +// wmsRawOrderInNewsSn.setWlCode(wmsRawOrderInSn1.getWlCode()); +// wmsRawOrderInNewsSn.setUserDefined3("1"); +// wmsOdsMateStorageNewsSnMapper.updateWmsOdsMateStorageNewsSnTWM(wmsRawOrderInNewsSn); +// wmsRawOrderInSn1.setUserDefined1("2"); +// wmsRawOrderInSnMapper.updateWmsRawOrderInSn(wmsRawOrderInSn1); +// WmsOdsMateStorageNews wmsOdsMateStorageNews=new WmsOdsMateStorageNews(); +// wmsOdsMateStorageNews.setMaterialCode(wmsRawOrderInSn1.getMaterialCode()); +// wmsOdsMateStorageNews.setWaCode(wmsRawOrderInSn1.getWaCode()); +// wmsOdsMateStorageNews.setWlCode(wmsRawOrderInSn1.getWlCode()); +// wmsOdsMateStorageNews.setWhCode(wmsRawOrderInSn1.getWhCode()); +// wmsOdsMateStorageNews.setStorageAmount(wmsRawOrderInSn1.getAmount()); +// wmsOdsMateStorageNewsMapper.updateWmsOdsMateStorageNewsUpdateStorageAmount(wmsOdsMateStorageNews); +// } +// wmsRawOrderIn.setOrderStatus("1"); +// wmsRawOrderIn.setAccountingTime(new Date()); +// wmsRawOrderIn.setAccountingMessage(result2.getMsg()); +// wmsRawOrderIn.setUserDefined4(MATERIALDOCUMENT); +// wmsRawOrderIn.setUserDefined5(MATDOCUMENTYEAR); +// wmsRawOrderInMapper.updateWmsRawOrderIn(wmsRawOrderIn); +// +// }else { +// //失败了 +// wmsRawOrderIn.setAccountingTime(new Date()); +// wmsRawOrderIn.setAccountingMessage(result2.getMsg()); +// wmsRawOrderInMapper.updateWmsRawOrderIn(wmsRawOrderIn); +// +// } + } + return result; + } @Override public List FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode()); 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 414577c0..26cc42c0 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 @@ -167,7 +167,10 @@ public class WmsSellOutEmbryoServiceImpl implements IWmsSellOutEmbryoService { public String addRE(List wmsSellOutEmbryoList) { String result="完成"; String stockOrder="BH"; - + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); + //TH ods_procure_order_card + Date date = new Date(); + String formattedDate = dateFormat.format(date); for (WmsSellOutEmbryo wmsSellOutEmbryo: wmsSellOutEmbryoList) { WmsSellOutEmbryo wmsSellOutEmbryo1= wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoById(wmsSellOutEmbryo.getId()); @@ -179,20 +182,28 @@ public class WmsSellOutEmbryoServiceImpl implements IWmsSellOutEmbryoService { } //区分大小planQuantity for ( WmsFpStorageNewsSn wmsFpStorageNewsSn: wmsFpStorageNewsSns){ - BigDecimal tem= wmsFpStorageNewsSn.getAmount(); + BigDecimal tem= wmsFpStorageNewsSn.getAmount();//数量 + //planQuantity看成总数量 + String stock= wmsSellOutEmbryoMapper.selectwmsFpStorageNewsTS(formattedDate); if(planQuantity.compareTo(tem)<=0){ - //生成一个 + //生成一个 + wmsSellOutEmbryo1.setStockOrder("BH"+stock); + wmsSellOutEmbryo1.setWaCode(wmsFpStorageNewsSn.getWaCode()); wmsSellOutEmbryo1.setPlanQuantity(planQuantity); - - wmsSellOutEmbryoMapper.insertWmsSellOutEmbryo(wmsSellOutEmbryo); + wmsSellOutEmbryo1.setId(IdUtils.fastSimpleUUID()); + wmsSellOutEmbryoMapper.insertWmsSellOutEmbryoOrder(wmsSellOutEmbryo); return result; }else { - - + wmsSellOutEmbryo1.setStockOrder("BH"+stock); + planQuantity = planQuantity.subtract(tem); // 用总数量减去tem，更新planQuantity的值 + wmsSellOutEmbryo1.setWaCode(wmsFpStorageNewsSn.getWaCode()); // 设置wmsSellOutEmbryo1的waCode为当前wmsFpStorageNewsSn的waCode + wmsSellOutEmbryo1.setPlanQuantity(tem); // 将tem的值赋给wmsSellOutEmbryo1的planQuantity + wmsSellOutEmbryo1.setId(IdUtils.fastSimpleUUID()); // 生成一个唯一ID并设置到wmsSellOutEmbryo1的ID字段 + wmsSellOutEmbryoMapper.insertWmsSellOutEmbryoOrder(wmsSellOutEmbryo1); // 将wmsSellOutEmbryo1插入到数据库 } } } - return null; + return result; } @Override 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 fc4e4939..4bd33097 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 @@ -517,4 +517,9 @@ WHERE wms_product_put.id = #{id} AND wms_product_put.SAP_status IN ( 0, 2 ) + 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 7efdad88..55521a71 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 @@ -394,6 +394,91 @@ #{remark}, + + insert into wms_sell_out_embryo_order + + id, + delivery_order, + Item_number, + factory_code, + wh_code, + wa_code, + wl_code, + delivery_place, + product_name, + product_code, + product_sort, + specification, + unit_of_measure, + lot_number, + plan_quantity, + out_quantity, + status, + SAP_status, + SAP_proof, + SAP_message, + out_date, + attr1, + attr2, + attr3, + attr4, + attr5, + attr6, + attr7, + attr8, + attr9, + attr10, + attr11, + attr12, + create_by, + create_time, + update_by, + update_time, + remark, + stock_order, + + + #{id}, + #{deliveryOrder}, + #{itemNumber}, + #{factoryCode}, + #{whCode}, + #{waCode}, + #{wlCode}, + #{deliveryPlace}, + #{productName}, + #{productCode}, + #{productSort}, + #{specification}, + #{unitOfMeasure}, + #{lotNumber}, + #{planQuantity}, + #{outQuantity}, + #{status}, + #{sapStatus}, + #{sapProof}, + #{sapMessage}, + #{outDate}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{attr5}, + #{attr6}, + #{attr7}, + #{attr8}, + #{attr9}, + #{attr10}, + #{attr11}, + #{attr12}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{stockOrder}, + + insert into wms_sell_out_embryo_special @@ -810,5 +895,18 @@ +