diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index dd258af65..3fac53ef6 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -272,6 +272,9 @@ public class WmsToWCSmissionController { @PostMapping("/SweepMaterialCardSC") public AjaxResult SweepMaterialCardSC(@RequestBody WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn) { WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn1 = odsProcureOrderService.SweepMaterialCardSC(wmsOdsMateStorageNewsSn); + if(wmsOdsMateStorageNewsSn1==null){ + return success("库存没有这个标识卡"); + } if (wmsOdsMateStorageNewsSn1.getUserDefined3().equals("0")){//userDefined3 return error("未105过账"); } @@ -964,4 +967,16 @@ public class WmsToWCSmissionController { String result = odsProcureOrderService.addOrderCardXNew(order); return success(result); } + /** + * 修改标识卡---要可以修改入库数量的操作（）按照最新修改的收货操作下，---要想实现的话，标识卡应该有应入数量（），已入数量（），最新要操作数量（User_Defined9），并且， + * 操作数量在操作了一次后加到已入数量里面后，--并且计算（应收减去已收）好下次应该收的数量放入最新要操作数量 + *这个接口就是用来修改的 + * @param order + * @return + */ + @PostMapping("upbatCardXNew") + public AjaxResult upbatCardXNew(@RequestBody OdsProcureOrder order) { + String result = odsProcureOrderService.upbatCardXNew(order); + return success(result); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java index 16fa584ca..43ac28a2b 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java @@ -204,6 +204,16 @@ public class OdsProcureOrder extends BaseEntity { */ @Excel(name = "计划数量") private BigDecimal planNumber; + //操作数量 + private BigDecimal temNumber; + + public BigDecimal getTemNumber() { + return temNumber; + } + + public void setTemNumber(BigDecimal temNumber) { + this.temNumber = temNumber; + } private BigDecimal buNumber; @@ -392,7 +402,6 @@ public class OdsProcureOrder extends BaseEntity { private String SapTempStatus; private String SAPstatus; private String SAPmessage; - public String getSapTempInfor() { return SapTempInfor; } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseAreaMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseAreaMapper.java index e82d195d0..9ba2a62c5 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseAreaMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseAreaMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.op.wms.domain.BaseArea; import com.op.wms.domain.BaseWarehouse; +import org.apache.ibatis.annotations.Param; /** * 库区Mapper接口 @@ -67,4 +68,6 @@ public interface BaseAreaMapper { public String checkAreaDescUnique(BaseArea baseArea); BaseWarehouse selectBaseWarehouse(BaseArea baseArea); + + String selectBaseAreaListnew(@Param("baseArea")String baseArea); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseProductAttachedMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseProductAttachedMapper.java index 42808c31c..212a02380 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseProductAttachedMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseProductAttachedMapper.java @@ -58,4 +58,6 @@ public interface BaseProductAttachedMapper { * @return 结果 */ public int deleteBaseProductAttachedByIds(String[] ids); + + String selectBaseAreaListnew(String waCode1); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java index ba1d858ef..7b7f07f0d 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java @@ -119,4 +119,6 @@ public interface OdsProcureOrderMapper { public List selectCardListSH(OdsProcureOrder odsProcureOrder); OdsProcureOrder selectOdsProcureOrderCardByUserDefined1new(OdsProcureOrder order); + + public void updateodsProcureOrderCardTemNumber(OdsProcureOrder order); } 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 b104c19b4..2de0716f6 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 @@ -151,4 +151,6 @@ public interface IOdsProcureOrderService { List selectCardList(OdsProcureOrder odsProcureOrder); String addOrderCardXNew(OdsProcureOrder orderList); + + String upbatCardXNew(OdsProcureOrder order); } 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 eece5c751..24dd9a86f 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 @@ -1134,20 +1134,22 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { //没有配置附属信息 return "没有配置附属信息"; } - - if ("".equals(baseProductAttacheds.get(0).getWaCode())){ + String waCode1 = baseProductAttacheds.get(0).getWaCode(); + if (waCode1==null|| waCode1.isEmpty()){ //没有配置附属信息 return "没有配置库区"; } - BaseArea baseArea=new BaseArea(); - baseArea.setAreaCode(baseProductAttacheds.get(0).getWaCode()); - List baseAreas= baseAreaMapper.selectBaseAreaList(baseArea); +// BaseArea baseArea=new BaseArea(); +// baseArea.setAreaCode(baseProductAttacheds.get(0).getWaCode()); + //根据库区查询仓库 - if (baseAreas.size()==0){ + + String whCode= baseProductAttachedMapper.selectBaseAreaListnew(waCode1); + if (whCode==null){ //没有配置附属信息 return "库区配置错误，查询不到对应仓库"; } - String whCode = baseAreas.get(0).getWhCode();//仓库 +// String whCode = baseAreas.get(0).getWhCode();//仓库 String waCode = baseProductAttacheds.get(0).getWaCode();//库区 String name = odsProcureOrderMapper.selectBaseSupplier(order); order.setSupplierName(name); @@ -1170,6 +1172,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { pw.setMaterialCode(order.getMaterialCode()); pw.setMaterialDesc(order.getMaterialDesc()); pw.setPlanNumber(pn); + pw.setTemNumber(pn); pw.setSupplierCode(order.getSupplierCode()); pw.setSupplierName(order.getSupplierName()); pw.setUserDefined8(order.getUserDefined8()); @@ -1180,8 +1183,10 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { pw.setUnit(order.getUnit()); if(pall.compareTo(pn)<0) {//最后一托盘 pw.setPlanNumber(pall); + pw.setTemNumber(pall); }else{ pw.setPlanNumber(pn); + pw.setTemNumber(pn); } pw.setCardNum(String.valueOf(i++)); String dateString = pw.getUserDefined11().replace("-", ""); @@ -1190,6 +1195,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { pw.setActive("1"); pw.setUserDefined5(whCode); pw.setUserDefined6(waCode); + pw.setRealityNumber(new BigDecimal("0")); dtos.add(pw); pall = pall.subtract(pn); } @@ -1225,6 +1231,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { pw.setMaterialCode(order.getMaterialCode()); pw.setMaterialDesc(order.getMaterialDesc()); pw.setPlanNumber(pn); + pw.setTemNumber(pn); pw.setSupplierCode(order.getSupplierCode()); pw.setSupplierName(order.getSupplierName()); pw.setUserDefined8(order.getUserDefined8()); @@ -1235,8 +1242,10 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { pw.setUnit(order.getUnit()); if(pall.compareTo(pn)<0) {//最后一托盘 pw.setPlanNumber(pall); + pw.setTemNumber(pall); }else{ pw.setPlanNumber(pn); + pw.setTemNumber(pn); } pw.setCardNum(String.valueOf(i++)); String dateString = pw.getUserDefined11().replace("-", ""); @@ -1245,6 +1254,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { pw.setActive("1"); pw.setUserDefined5(whCode); pw.setUserDefined6(waCode); + pw.setRealityNumber(new BigDecimal("0")); dtos.add(pw); pall = pall.subtract(pn); } @@ -1304,7 +1314,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { // 格式化当前时间为指定的字符串格式 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); // 定义时间格式 String dnNo = "sn" + now.format(formatter); // 生成流水号 - String receiptNoCode = orderList.get(0).getReceiptNoCode(); + String receiptNoCode = dnNo; //如果这样的话，就区分出来单子和对应的物料。然后根据集合放入暂收集合中 List orderList1=new ArrayList<>();// @@ -1316,6 +1326,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { order.setPoLine(order1.getUserDefined3()); order.setUnit(order1.getUnit()); order.setID(order1.getID()); + // order1.setReceiptNoCode(dnNo); order.setReceiptNoCode(dnNo); if (orderList1.size()>0){ String tem="0"; @@ -1398,7 +1409,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { wmsRawOrderInSnMapper.insertWmsLogotypeTable(wmsLogotypeTable); } - odsProcureOrderMapper.updateodsProcureOrderCard(order1k); + odsProcureOrderMapper.updateodsProcureOrderCard(order1k);//更新标识卡。状态为1 } Map map = new HashMap(); map = (Map) result2.getData(); @@ -1426,9 +1437,9 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { wmsRawOrderIn.setRawOrderInId(IdUtils.fastSimpleUUID()); wmsRawOrderIn.setFactoryCode(odsProcureOrder.getFactoryCode()); wmsRawOrderIn.setOrderNo(order1.getUserDefined5());//送货单 - wmsRawOrderIn.setDnNo(receiptNoCode); + wmsRawOrderIn.setDnNo(receiptNoCode);//有问提 wmsRawOrderIn.setPoNo(odsProcureOrder.getProcureCode()); - wmsRawOrderIn.setPoLine(odsProcureOrder.getPoLine()); + wmsRawOrderIn.setPoLine(odsProcureOrder.getUserDefined3());//有问题 wmsRawOrderIn.setMaterialCode(odsProcureOrder.getMaterialCode()); wmsRawOrderIn.setMaterialDesc(odsProcureOrder.getMaterialDesc()); wmsRawOrderIn.setRequestAmount(odsProcureOrder.getCzNumber()); @@ -1520,6 +1531,14 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { return result1; } + @Override + public String upbatCardXNew(OdsProcureOrder order) { + String result="修改成功"; + DynamicDataSourceContextHolder.push("ds_" + order.getFactoryCode()); + odsProcureOrderMapper.updateodsProcureOrderCardTemNumber(order);//更新标识卡。状态为1 + return result; + } + @Override @DS("#header.poolName") public String getIdCardListDA(OdsProcureOrder odsProcureOrder) { @@ -2959,67 +2978,67 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { */ @Override public String handleUpdateSAP105(List odsProcureOrders) { - String result="操作成功"; - for (OdsProcureOrder order: odsProcureOrders){ - OdsProcureOrder odsProcureOrder = order; - WmsRawOrderIn wmsRawOrderIn= wmsRawOrderInMapper.selectWmsRawOrderInByRawOrderInIdTWO(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.sap105temporarilyCollected(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); - - } - } + String result="操作失败"; +// for (OdsProcureOrder order: odsProcureOrders){ +// OdsProcureOrder odsProcureOrder = order; +// WmsRawOrderIn wmsRawOrderIn= wmsRawOrderInMapper.selectWmsRawOrderInByRawOrderInIdTWO(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.sap105temporarilyCollected(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; } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseAreaMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseAreaMapper.xml index 522ef0ad7..ec49d95f1 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseAreaMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseAreaMapper.xml @@ -76,11 +76,17 @@ and user_defined3 = #{userDefined3} and active_flag = #{activeFlag} and factory_code = #{factoryCode} - and factory_code = #{factoryCode} + and del_flag = '0' - + + SELECT + wh_code + FROM + base_area + where area_code like concat('%', #{baseArea}, '%') + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml index 53fd5ddb1..3ea4e6900 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml @@ -44,6 +44,7 @@ + @@ -485,6 +486,7 @@ Enterprise_Id, Enterprise_Code, + tem_number, @@ -552,6 +554,7 @@ #{dto.enterpriseId}, #{dto.enterpriseCode}, + #{dto.temNumber}, @@ -624,6 +627,7 @@ o.Last_Update_Date, o.Active, o.Enterprise_Id, + o.Sap_Temp_Infor, o.Enterprise_Code, base_product_attached.pallet_num, COALESCE ( Operation_Number, 0 ) Operation_Number FROM @@ -674,6 +678,11 @@ SET User_Defined10 = '1' where User_Defined1 = #{userDefined6} + + update ods_procure_order_card + SET tem_number = #{temNumber} + where User_Defined1 = #{userDefined1} +