From 2107dd5da50bb031e6b3ba6d4e9def30c9cf6ef0 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Wed, 27 Nov 2024 11:15:21 +0800 Subject: [PATCH 01/19] =?UTF-8?q?wms=E6=96=B0=E7=9A=84=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OdsProcureOrderController.java | 9 +- .../WmsOdsMateStorageNewsSnController.java | 8 +- .../controller/WmsToWCSmissionController.java | 15 + .../java/com/op/wms/domain/BaseProduct.java | 9 + .../op/wms/domain/BaseProductAttached.java | 9 + .../java/com/op/wms/domain/WmsRawOrderIn.java | 2 +- .../op/wms/mapper/OdsProcureOrderMapper.java | 32 +- .../mapper/WmsOdsMateStorageNewsMapper.java | 13 +- .../mapper/WmsOdsMateStorageNewsSnMapper.java | 6 +- .../op/wms/mapper/WmsRawOrderInSnMapper.java | 13 +- .../wms/service/IOdsProcureOrderService.java | 4 + .../IWmsOdsMateStorageNewsSnService.java | 2 + .../impl/OdsProcureOrderServiceImpl.java | 300 ++++++++++++++++-- .../WmsOdsMateStorageNewsSnServiceImpl.java | 23 +- .../mapper/wms/BaseProductAttachedMapper.xml | 8 +- .../mapper/wms/BaseProductMapper.xml | 4 +- .../mapper/wms/OdsProcureOrderMapper.xml | 110 +++++++ .../wms/WmsOdsMateStorageNewsMapper.xml | 9 +- .../wms/WmsOdsMateStorageNewsSnMapper.xml | 4 +- .../mapper/wms/WmsRawOrderInSnMapper.xml | 3 + 20 files changed, 533 insertions(+), 50 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java index 42954ab0d..64f9e6cea 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java @@ -49,11 +49,18 @@ public class OdsProcureOrderController extends BaseController { List list = odsProcureOrderService.selectOdsProcureOrderList(odsProcureOrder); return getDataTable(list); } - /**获取标识卡**/ + /**获取标识卡 + * 修改，优法现有收货功能：在包材采购单打印的时候选择区位产生记录直接写到包材库存明细---暂收的时候，贴完标示卡后，仓管员手持扫描送货单号进行暂收； + *冲销要随之修改---明细不进行删除而是进行修改状态改为未入库，总库存进行删除，其他的照旧，或许是有问题的，看使用问题了 + * 还有操作问题--即如果打印了单子，收了一部分，--但是他要重新打印，这是不可以的，收了一部分后不能重新打印， + * 重新了解了下，不直接加进行明细了，而是在前端手持上加上一键收货 + * + **/ @PostMapping("/getIdCardList") public AjaxResult getIdCardList(@RequestBody OdsProcureOrder odsProcureOrder) { return success(odsProcureOrderService.getIdCardList(odsProcureOrder)); } + @PostMapping("/getIdCardListTH") public AjaxResult getIdCardListTH(@RequestBody OdsProcureOrder odsProcureOrder) { return success(odsProcureOrderService.getIdCardListTH(odsProcureOrder)); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsMateStorageNewsSnController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsMateStorageNewsSnController.java index bad9b2b7e..8e7b4b788 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsMateStorageNewsSnController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsMateStorageNewsSnController.java @@ -106,10 +106,16 @@ public class WmsOdsMateStorageNewsSnController extends BaseController { public AjaxResult cardDy(@RequestBody List list) { return success(wmsOdsMateStorageNewsSnService.cardDy(list)); } - //特殊出库 + //补打 @PostMapping("/cardBD") public AjaxResult cardBD( @RequestBody List orderList) { String result = wmsOdsMateStorageNewsSnService.cardBD(orderList); return success(result); } + //删除 + @PostMapping("/Removecard") + public AjaxResult Removecard( @RequestBody List orderList) { + String result = wmsOdsMateStorageNewsSnService.Removecard(orderList); + return success(result); + } } 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 8347d8797..dd258af65 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 @@ -948,5 +948,20 @@ public class WmsToWCSmissionController { public AjaxResult add(@RequestBody BpRawMaterialInDetail bpRawMaterialInDetail){ return success(bpRawMaterialInDetailService.insertBpRawMaterialInDetailSC(bpRawMaterialInDetail)); } + //根据送货单选择标识卡---非必须条件有送货单 + @PostMapping("/selectCardList") + public AjaxResult selectCardList(@RequestBody OdsProcureOrder odsProcureOrder) { + return success(odsProcureOrderService.selectCardList(odsProcureOrder)); + } + /** + * 最最新的的收货确认接口 + * @param order + * @return + */ + @PostMapping("/addOrderCardXNew") + public AjaxResult addOrderCardXNew(@RequestBody OdsProcureOrder order) { + String result = odsProcureOrderService.addOrderCardXNew(order); + return success(result); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java index c4c1bf83a..d67d5476e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java @@ -362,6 +362,15 @@ public class BaseProduct extends BaseEntity { private String palletNum; private String warehouseCycle; private String packType; + private String waCode; + + public String getWaCode() { + return waCode; + } + + public void setWaCode(String waCode) { + this.waCode = waCode; + } public String getBoxType() { return boxType; diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java index 76c7becc1..7a206a48e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java @@ -127,6 +127,15 @@ public class BaseProductAttached extends BaseEntity { private String packType; private String cpkType; private String cpkTypeName; + private String waCode; + + public String getWaCode() { + return waCode; + } + + public void setWaCode(String waCode) { + this.waCode = waCode; + } public String getCpkType() { return cpkType; diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsRawOrderIn.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsRawOrderIn.java index 3a5e2ae8e..ca9fc1de8 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsRawOrderIn.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsRawOrderIn.java @@ -163,7 +163,7 @@ public class WmsRawOrderIn extends BaseEntity { private String qualityStatus; /** - * 0创建1拒收2收货完成3上架完成4入库完成 + * 0创建1拒收2收货完成3上架完成4入库完成,5是冲销 */ @Excel(name = "0创建1拒收2收货完成3上架完成4入库完成") private String orderStatus; 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 51614d473..ba1d858ef 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 @@ -3,6 +3,7 @@ package com.op.wms.mapper; import java.util.List; import com.op.wms.domain.OdsProcureOrder; +import com.op.wms.domain.WmsRawOrderIn; import org.apache.ibatis.annotations.Param; /** @@ -60,27 +61,27 @@ public interface OdsProcureOrderMapper { */ public int deleteOdsProcureOrderByIDs(String[] IDs); - Integer updateRealityNuById(OdsProcureOrder odsProcureOrder); + public Integer updateRealityNuById(OdsProcureOrder odsProcureOrder); - String selectBaseSupplier(OdsProcureOrder odsProcureOrder); + public String selectBaseSupplier(OdsProcureOrder odsProcureOrder); - List selectOdsProcureOrderAlreadyList(OdsProcureOrder odsProcureOrder); + public List selectOdsProcureOrderAlreadyList(OdsProcureOrder odsProcureOrder); - void updateOdsProcureOrderAddOperationNumber(OdsProcureOrder odsProcureOrder); + public void updateOdsProcureOrderAddOperationNumber(OdsProcureOrder odsProcureOrder); - List selectOdsProcureOrderAlreadyReaderList(OdsProcureOrder odsProcureOrder); + public List selectOdsProcureOrderAlreadyReaderList(OdsProcureOrder odsProcureOrder); - void updateOdsProcureOrderByProcureCode(OdsProcureOrder odsProcureOrder); + public void updateOdsProcureOrderByProcureCode(OdsProcureOrder odsProcureOrder); - List getIdCardList(OdsProcureOrder odsProcureOrder); + public List getIdCardList(OdsProcureOrder odsProcureOrder); - void addBatchPallet(@Param("list")List dtos); + public void addBatchPallet(@Param("list")List dtos); - OdsProcureOrder selectOdsProcureOrderCard(OdsProcureOrder odsProcureOrder); + public OdsProcureOrder selectOdsProcureOrderCard(OdsProcureOrder odsProcureOrder); - void updateodsProcureOrderCard(OdsProcureOrder order1); + public void updateodsProcureOrderCard(OdsProcureOrder order1); - OdsProcureOrder selectOdsProcureOrderByIDAndSap(String id); + public OdsProcureOrder selectOdsProcureOrderByIDAndSap(String id); /** * 查询包材采购单列表 @@ -109,4 +110,13 @@ public interface OdsProcureOrderMapper { public String selectOdsProcureOrderUserDefined7New(@Param("formattedTEM")String formattedDate); public List selectOdsProcureOrderListSH(OdsProcureOrder order2); + + public void deleteBatchPalletBycard(@Param("wlCode")String wlCode); + + public void updateOdsProcureOrderBy(WmsRawOrderIn wmsRawOrderIn); + + public List selectCardList(OdsProcureOrder odsProcureOrder); + public List selectCardListSH(OdsProcureOrder odsProcureOrder); + + OdsProcureOrder selectOdsProcureOrderCardByUserDefined1new(OdsProcureOrder order); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsMapper.java index 36f72f1ec..0195c3ceb 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsMapper.java @@ -6,6 +6,7 @@ import com.op.wms.domain.WCSInventoryPlan; import com.op.wms.domain.WmsOdsEmStorageNews; import com.op.wms.domain.WmsOdsMateStorageNews; import com.op.wms.domain.WmsToWCSDTO; +import org.apache.ibatis.annotations.Param; /** * 包材库存主表Mapper接口 @@ -69,13 +70,17 @@ public interface WmsOdsMateStorageNewsMapper { public void updateWmsOdsMateStorageNewsUpdateStorageAmount(WmsOdsMateStorageNews wmsOdsMateStorageNews); - List selectWmsOdsMateStorageNewslsList(WmsOdsMateStorageNews wmsOdsMateStorageNews); + public List selectWmsOdsMateStorageNewslsList(WmsOdsMateStorageNews wmsOdsMateStorageNews); - WmsOdsMateStorageNews selectWmsOdsMateStorageNewsLSByStorageId(String storageId); + public WmsOdsMateStorageNews selectWmsOdsMateStorageNewsLSByStorageId(String storageId); public List selectWmsOdsMateStorageNewsNEWSList(WmsOdsMateStorageNews wmsOdsMateStorageNews); - List listWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); + public List listWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); - List listwmsFpStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); + public List listwmsFpStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); + + public void deleteWmsOdsMateStorageNewsBycard(@Param("wlCode")String wlCode); + + public void updateodsProcureOrderCard(@Param("userDefined6")String userDefined6); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java index 44f7dc106..c053cd77c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java @@ -79,7 +79,9 @@ public interface WmsOdsMateStorageNewsSnMapper { public void updateWmsOdsMateStorageNewsSnTWM(WmsOdsMateStorageNewsSn wmsRawOrderInNewsSn); - List cardDy(@Param("list")List list); + public List cardDy(@Param("list")List list); - String selectWmsOdsMateStorageNewsSnBC(OdsProcureOutOrder order); + public String selectWmsOdsMateStorageNewsSnBC(OdsProcureOutOrder order); + + public void deleteWmsOdsMateStorageNewsSnBycard(@Param("wlCode")String wlCode); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInSnMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInSnMapper.java index 3e15e639b..55e84a3ec 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInSnMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInSnMapper.java @@ -3,6 +3,7 @@ package com.op.wms.mapper; import java.util.List; import com.op.wms.domain.*; +import org.apache.ibatis.annotations.Param; /** * 原材料收货明细Mapper接口 @@ -59,14 +60,16 @@ public interface WmsRawOrderInSnMapper { */ public int deleteWmsRawOrderInSnByRawOrderInSnIds(Long[] rawOrderInSnIds); - WmsRawOrderInSn selectwmsRfidNo(WmsToWCSDTO wmsToWCSDTO); + public WmsRawOrderInSn selectwmsRfidNo(WmsToWCSDTO wmsToWCSDTO); - void updateU1Byid(WmsRawOrderInSn wmsRawOrderInSn); + public void updateU1Byid(WmsRawOrderInSn wmsRawOrderInSn); - List selecPurchaseOrderdeliPdaList(OdsProcureOrder odsProcureOrder); + public List selecPurchaseOrderdeliPdaList(OdsProcureOrder odsProcureOrder); - void insertWmsLogotypeTable(WmsLogotypeTable wmsLogotypeTable); + public void insertWmsLogotypeTable(WmsLogotypeTable wmsLogotypeTable); - WmsRawOrderInSn selecPurchaseOrderdeliPdaById(OdsProcureOrder odsProcureOrder); + public WmsRawOrderInSn selecPurchaseOrderdeliPdaById(OdsProcureOrder odsProcureOrder); + + public void deleteWmsRawOrderInByu5(@Param("dnNo")String dnNo,@Param("kem")String kem); } 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 69918bc53..b104c19b4 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 @@ -147,4 +147,8 @@ public interface IOdsProcureOrderService { String handleUpdateSAP103(List odsProcureOrder); String handleUpdateSAP105(List odsProcureOrder); + + List selectCardList(OdsProcureOrder odsProcureOrder); + + String addOrderCardXNew(OdsProcureOrder orderList); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsMateStorageNewsSnService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsMateStorageNewsSnService.java index 5cb6b10f2..4d57da7d0 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsMateStorageNewsSnService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsMateStorageNewsSnService.java @@ -63,4 +63,6 @@ public interface IWmsOdsMateStorageNewsSnService { String cardDy(List list); String cardBD(List orderList); + + String Removecard(List orderList); } 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 66d26911e..eece5c751 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 @@ -9,6 +9,8 @@ import com.alibaba.fastjson.JSONObject; import java.math.BigDecimal; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; @@ -84,7 +86,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { @Autowired private BaseProductAttachedMapper baseProductAttachedMapper; - + private BaseAreaMapper baseAreaMapper; @Value("${dayin.url1}") private String dayinUrl1; /** @@ -1121,7 +1123,6 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { @Override @DS("#header.poolName") public String getIdCardList(OdsProcureOrder odsProcureOrder) { - // DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); List dtos = new ArrayList<>(); OdsProcureOrder order=odsProcureOrderMapper.selectOdsProcureOrderByID(odsProcureOrder.getID()); //根据采购单获取一托盘要装多少 @@ -1133,6 +1134,21 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { //没有配置附属信息 return "没有配置附属信息"; } + + if ("".equals(baseProductAttacheds.get(0).getWaCode())){ + //没有配置附属信息 + return "没有配置库区"; + } + BaseArea baseArea=new BaseArea(); + baseArea.setAreaCode(baseProductAttacheds.get(0).getWaCode()); + List baseAreas= baseAreaMapper.selectBaseAreaList(baseArea); + //根据库区查询仓库 + if (baseAreas.size()==0){ + //没有配置附属信息 + return "库区配置错误，查询不到对应仓库"; + } + String whCode = baseAreas.get(0).getWhCode();//仓库 + String waCode = baseProductAttacheds.get(0).getWaCode();//库区 String name = odsProcureOrderMapper.selectBaseSupplier(order); order.setSupplierName(name); List dtos0= odsProcureOrderMapper.getIdCardList(order); @@ -1142,7 +1158,6 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { int i = 1; String palletNum = baseProductAttacheds.get(0).getPalletNum(); Date nowDate = DateUtils.getNowDate(); - if(palletNum!=null){ BigDecimal pall = order.getPlanNumber(); BigDecimal pn = new BigDecimal(palletNum); @@ -1173,11 +1188,12 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { pw.setUserDefined1(pw.getProcureCode()+"-"+pw.getUserDefined3()+"-"+pw.getUserDefined8()+"-"+dateString+"-"+odsProcureOrder.getID()+"-"+pw.getCardNum());//采购单+行项目+类型+日期+板次 pw.setCreateTime(nowDate); pw.setActive("1"); + pw.setUserDefined5(whCode); + pw.setUserDefined6(waCode); dtos.add(pw); pall = pall.subtract(pn); } } - if(!CollectionUtils.isEmpty(dtos)){ int tem= dtos.size(); int ken=1; @@ -1227,6 +1243,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { pw.setUserDefined1(pw.getProcureCode()+"-"+pw.getUserDefined3()+"-"+pw.getUserDefined8()+"-"+dateString+"-"+odsProcureOrder.getID()+"-"+pw.getCardNum());//采购单+行项目+类型+日期+板次 pw.setCreateTime(nowDate); pw.setActive("1"); + pw.setUserDefined5(whCode); + pw.setUserDefined6(waCode); dtos.add(pw); pall = pall.subtract(pn); } @@ -1260,6 +1278,247 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { String msg= dayin(dtos); return msg; } + @Override + public List selectCardList(OdsProcureOrder odsProcureOrder) { + DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); + List orderList= odsProcureOrderMapper.selectCardList(odsProcureOrder); + return orderList; + } + + @Override + public String addOrderCardXNew(OdsProcureOrder ordernew) { + String factoryCode = ordernew.getFactoryCode(); + //现在是传了个list标识卡集合 + String result1="操作成功"; + DynamicDataSourceContextHolder.push("ds_" + factoryCode); + List orderList= odsProcureOrderMapper.selectCardListSH(ordernew); + if (orderList.size()==0){ + result1="生成的标识卡已经暂收完成"; + return result1; + } + + + //到货单生成 + + LocalDateTime now = LocalDateTime.now(); // 获取当前时间 + // 格式化当前时间为指定的字符串格式 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); // 定义时间格式 + String dnNo = "sn" + now.format(formatter); // 生成流水号 + String receiptNoCode = orderList.get(0).getReceiptNoCode(); + + //如果这样的话，就区分出来单子和对应的物料。然后根据集合放入暂收集合中 + List orderList1=new ArrayList<>();// + + for (OdsProcureOrder order: + orderList) { + OdsProcureOrder order1= odsProcureOrderMapper.selectOdsProcureOrderCardByUserDefined1(order); + order.setUserDefined7(order1.getUserDefined7());//批次 + order.setPoLine(order1.getUserDefined3()); + order.setUnit(order1.getUnit()); + order.setID(order1.getID()); + order.setReceiptNoCode(dnNo); + if (orderList1.size()>0){ + String tem="0"; + for (OdsProcureOrder odsProcureOrder:orderList1){ + if (odsProcureOrder.getID().equals(order1.getID())){ + tem="1";//已经保存对应订单了 + } + } + if (tem.equals("0")){ + orderList1.add(order1); + } + }else { + orderList1.add(order1); + } + } + for (OdsProcureOrder odsProcureOrder: + orderList1) { + //单子 + BigDecimal czNumber=new BigDecimal("0"); + for ( OdsProcureOrder order : + orderList) { + if (order.getID().equals(odsProcureOrder.getID())){ + czNumber=czNumber.add(order.getPlanNumber()); + } + } + odsProcureOrder.setCzNumber(czNumber);//累计数量 + } + + List mapList = new ArrayList<>(); + for (OdsProcureOrder order : + orderList1) { + Map paramMap=new HashMap<>(); + paramMap.put("EBELN",order.getProcureCode());// + paramMap.put("EBELP",order.getUserDefined3());//行项目 + paramMap.put("MATNR",order.getMaterialCode());//物料 + paramMap.put("WERKS",order.getSiteCode());//工厂 + paramMap.put("QUANTITY",order.getCzNumber());//数量 + paramMap.put("P_LFSNR",order.getUserDefined5());//送 + mapList.add(paramMap); + } + R result2 = remoteSapService.temporarilyCollected(mapList); + int code = result2.getCode(); + if (code == 200){ + //对应采购单的标识卡 + for (OdsProcureOrder order1k: + orderList) { + //标识卡信息 + //wms_raw_order_in_sn + WmsRawOrderInSn wmsRawOrderInSn = new WmsRawOrderInSn(); + wmsRawOrderInSn.setRawOrderInSnId(IdUtils.fastSimpleUUID()); + wmsRawOrderInSn.setUserDefined1("1");//１是收货，２是入库 + wmsRawOrderInSn.setUserDefined2(order1k.getUserDefined7());//批次 + wmsRawOrderInSn.setWhCode(order1k.getWhCode());//厂库编号 + wmsRawOrderInSn.setWaCode(order1k.getWaCode()); + wmsRawOrderInSn.setWlCode(order1k.getSn());//库位设置为托盘 + wmsRawOrderInSn.setPoNo(order1k.getProcureCode());//采购单号 + wmsRawOrderInSn.setPoLine(order1k.getPoLine());//行项目 + wmsRawOrderInSn.setMaterialCode(order1k.getMaterialCode()); + wmsRawOrderInSn.setMaterialDesc(order1k.getMaterialDesc()); + wmsRawOrderInSn.setAmount(order1k.getPlanNumber());//实际输入数量 + wmsRawOrderInSn.setFactoryCode(order1k.getFactoryCode()); + wmsRawOrderInSn.setCreateBy(order1k.getCreateBy()); + wmsRawOrderInSn.setGmtCreate(new Date()); + wmsRawOrderInSn.setActiveFlag("1"); + wmsRawOrderInSn.setUserDefined4(order1k.getUnit());//单位 + wmsRawOrderInSn.setSn(order1k.getSn());//托盘号 + wmsRawOrderInSn.setFactoryCode(order1k.getFactoryCode()); + wmsRawOrderInSn.setUserDefined3(order1k.getID()); + wmsRawOrderInSn.setUserDefined5(order1k.getReceiptNoCode()); + //wmsRawOrderInSn.setd + wmsRawOrderInSn.setUserDefined6(order1k.getUserDefined6());//标识码绑定 + wmsRawOrderInSnMapper.insertWmsRawOrderInSn(wmsRawOrderInSn); + //标识码绑定 + if (order1k.getUserDefined6()!=null){ + WmsLogotypeTable wmsLogotypeTable=new WmsLogotypeTable(); + wmsLogotypeTable.setId(IdUtils.fastSimpleUUID()); + wmsLogotypeTable.setLogotype(order1k.getUserDefined6()); + wmsLogotypeTable.setSn(order1k.getSn()); + wmsLogotypeTable.setActiveFlag("1"); + wmsRawOrderInSnMapper.insertWmsLogotypeTable(wmsLogotypeTable); + } + + odsProcureOrderMapper.updateodsProcureOrderCard(order1k); + } + Map map = new HashMap(); + map = (Map) result2.getData(); + String MATERIALDOCUMENT = (String) map.get("MATERIALDOCUMENT"); + String MATDOCUMENTYEAR = (String) map.get("MATDOCUMENTYEAR"); + for (OdsProcureOrder odsProcureOrder: + orderList1) { + BigDecimal planNumber= odsProcureOrder.getPlanNumber(); + ;//操作数量 + odsProcureOrder.setOrderStatus("1"); + BigDecimal result = odsProcureOrder.getRealityNumber().add(odsProcureOrder.getCzNumber()); + System.out.println(result); + if (result.compareTo(planNumber)== 0) { + odsProcureOrder.setOrderStatus("2"); + } + odsProcureOrder.setPlanNumber(odsProcureOrder.getCzNumber()); + odsProcureOrderMapper.updateRealityNuById(odsProcureOrder); + } + for (OdsProcureOrder odsProcureOrder: + orderList1) { + //标识卡记录已经录入，订单已经修改完成 + OdsProcureOrder order1 = odsProcureOrderMapper.selectOdsProcureOrderByID(odsProcureOrder.getID()); + order1.setSapTempInfor(result2.getMsg()); + WmsRawOrderIn wmsRawOrderIn=new WmsRawOrderIn(); + wmsRawOrderIn.setRawOrderInId(IdUtils.fastSimpleUUID()); + wmsRawOrderIn.setFactoryCode(odsProcureOrder.getFactoryCode()); + wmsRawOrderIn.setOrderNo(order1.getUserDefined5());//送货单 + wmsRawOrderIn.setDnNo(receiptNoCode); + wmsRawOrderIn.setPoNo(odsProcureOrder.getProcureCode()); + wmsRawOrderIn.setPoLine(odsProcureOrder.getPoLine()); + wmsRawOrderIn.setMaterialCode(odsProcureOrder.getMaterialCode()); + wmsRawOrderIn.setMaterialDesc(odsProcureOrder.getMaterialDesc()); + wmsRawOrderIn.setRequestAmount(odsProcureOrder.getCzNumber()); + wmsRawOrderIn.setUnit(odsProcureOrder.getUnit()); + wmsRawOrderIn.setRequestTime(new Date()); + wmsRawOrderIn.setOrderStatus("0");//暂收 + wmsRawOrderIn.setActiveFlag("1"); + wmsRawOrderIn.setSupplyCode(odsProcureOrder.getSupplierCode()); + //wmsRawOrderIn.setUserDefined1(); + wmsRawOrderIn.setAccountingStatus("0");//0是暂收 + wmsRawOrderIn.setUserDefined1(MATERIALDOCUMENT);//物料凭证编号 + wmsRawOrderIn.setUserDefined2(MATDOCUMENTYEAR);//年凭证号 + wmsRawOrderIn.setUserDefined3(result2.getMsg());//暂收信息 + //wmsRawOrderIn.setAccountingMessage(result2.getMsg()); + wmsRawOrderIn.setSapFactoryCode(factoryCode); + wmsRawOrderIn.setCreateBy(odsProcureOrder.getCreateBy()); + wmsRawOrderIn.setGmtCreate(new Date()); + wmsRawOrderInMapper.insertWmsRawOrderIn(wmsRawOrderIn); + order1.setSapTempStatus("1");//0是失败。1是成功 + odsProcureOrderMapper.updateOdsProcureOrder(order1); + } + + + for (OdsProcureOrder odsProcureOrder1:orderList){ + //收货 + WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn = new WmsOdsMateStorageNewsSn(); + wmsOdsMateStorageNewsSn.setMateOrderInSnId(IdUtils.fastSimpleUUID()); + wmsOdsMateStorageNewsSn.setWhCode(odsProcureOrder1.getWhCode());//仓库编码 + wmsOdsMateStorageNewsSn.setWaCode(odsProcureOrder1.getWaCode()); + wmsOdsMateStorageNewsSn.setWlCode(odsProcureOrder1.getSn());//库位编码- + wmsOdsMateStorageNewsSn.setMaterialCode(odsProcureOrder1.getMaterialCode()); + wmsOdsMateStorageNewsSn.setMaterialDesc(odsProcureOrder1.getMaterialDesc()); + wmsOdsMateStorageNewsSn.setSn(odsProcureOrder1.getSn()); + wmsOdsMateStorageNewsSn.setAmount(odsProcureOrder1.getPlanNumber()); + wmsOdsMateStorageNewsSn.setCreateBy(odsProcureOrder1.getCreateBy()); + wmsOdsMateStorageNewsSn.setGmtCreate(new Date()); + wmsOdsMateStorageNewsSn.setUserDefined2(odsProcureOrder1.getUserDefined7());//批次 + wmsOdsMateStorageNewsSn.setUserDefined1("RK"); + wmsOdsMateStorageNewsSn.setUserDefined3("0");//0是暂收，1是真收 + wmsOdsMateStorageNewsSn.setFactoryCode(odsProcureOrder1.getFactoryCode()); + wmsOdsMateStorageNewsSn.setSapFactoryCode(odsProcureOrder1.getFactoryCode()); + wmsOdsMateStorageNewsSn.setActiveFlag("1"); + wmsOdsMateStorageNewsSnMapper.insertWmsOdsMateStorageNewsSn(wmsOdsMateStorageNewsSn); + //修改库存 + //２，修改库存－－－／加库存数量-/-冻结数量 + WmsOdsEmStorageNews wmsOdsEmStorageNews = new WmsOdsEmStorageNews(); + wmsOdsEmStorageNews.setWhCode(odsProcureOrder1.getWhCode());//仓库编码 + wmsOdsEmStorageNews.setWlCode(odsProcureOrder1.getSn());//库位编码 + wmsOdsEmStorageNews.setWaCode(odsProcureOrder1.getWaCode());//库位编码 + wmsOdsEmStorageNews.setMaterialCode(odsProcureOrder1.getMaterialCode()); + wmsOdsEmStorageNews.setUserDefined2(odsProcureOrder1.getUserDefined7());//批次 + wmsOdsEmStorageNews.setAmount(odsProcureOrder1.getPlanNumber()); + //添加库存--这个要有个判断有没有这个库存如果没有的话，就插入 + WmsOdsMateStorageNews wmsOdsMateStorageNews = wmsOdsMateStorageNewsMapper.selectByWhCodeAndMate(wmsOdsEmStorageNews); + if (wmsOdsMateStorageNews == null) { + WmsOdsMateStorageNews wmsOdsMateStorageNews1 = new WmsOdsMateStorageNews(); + wmsOdsMateStorageNews1.setStorageId(IdUtils.fastSimpleUUID()); + wmsOdsMateStorageNews1.setWhCode(odsProcureOrder1.getWhCode()); + wmsOdsMateStorageNews1.setWlCode(odsProcureOrder1.getSn()); + wmsOdsMateStorageNews1.setWaCode(odsProcureOrder1.getWaCode()); + wmsOdsMateStorageNews1.setAmount(odsProcureOrder1.getPlanNumber()); + wmsOdsMateStorageNews1.setStorageAmount(odsProcureOrder1.getPlanNumber()); + wmsOdsMateStorageNews1.setMaterialCode(odsProcureOrder1.getMaterialCode()); + wmsOdsMateStorageNews1.setMaterialDesc(odsProcureOrder1.getMaterialDesc()); + wmsOdsMateStorageNews1.setStorageType("BC"); + wmsOdsMateStorageNews1.setCreateBy(odsProcureOrder1.getCreateBy()); + wmsOdsMateStorageNews1.setGmtCreate(new Date()); + wmsOdsMateStorageNews1.setActiveFlag("1"); + wmsOdsMateStorageNews1.setFactoryCode(odsProcureOrder1.getFactoryCode()); + wmsOdsMateStorageNews1.setSapFactoryCode(odsProcureOrder1.getFactoryCode()); + wmsOdsMateStorageNews1.setUserDefined1(odsProcureOrder1.getUnit());//单位 + wmsOdsMateStorageNewsMapper.insertWmsOdsMateStorageNews(wmsOdsMateStorageNews1); + } else { + wmsOdsMateStorageNewsSnMapper.updateAdd(wmsOdsEmStorageNews); + } + // wmsRawOrderInSnMapper.updateU1Byid(wmsRawOrderInSn);//入库 + } + }else {////失败| + result1="暂收失败"; + for (OdsProcureOrder order : + orderList1) { + OdsProcureOrder order2 = odsProcureOrderMapper.selectOdsProcureOrderByID(order.getID()); + order2.setSapTempInfor(result2.getMsg()); + order2.setSapTempStatus("0");//0是失败。1是成功 + odsProcureOrderMapper.updateOdsProcureOrder(order2); + } + return result1; + } + return result1; + } @Override @DS("#header.poolName") @@ -2627,6 +2886,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { * @return */ @Override + @DS("#header.poolName") public String handleUpdateSAP103(List odsProcureOrders) { String result="操作成功"; for (OdsProcureOrder order: odsProcureOrders){ @@ -2652,8 +2912,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { //成功了--成功了,根据 WmsRawOrderInSn wmsRawOrderInSn=new WmsRawOrderInSn(); wmsRawOrderInSn.setUserDefined5(wmsRawOrderIn.getDnNo()); - wmsRawOrderInSn.setUserDefined1("1");//暂收--１是收货，２是入库，，3是103冲销 - + wmsRawOrderInSn.setUserDefined1("1");//暂收--１是收货，２是入库，， wmsRawOrderInSn.setUserDefined3(wmsRawOrderIn.getKem()); List wmsRawOrderInSnList= wmsRawOrderInSnMapper.selectWmsRawOrderInSnList(wmsRawOrderInSn); for (WmsRawOrderInSn wmsRawOrderInSn1: @@ -2664,30 +2923,31 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { wmsRawOrderInNewsSn.setWhCode(wmsRawOrderInSn1.getWhCode()); wmsRawOrderInNewsSn.setWlCode(wmsRawOrderInSn1.getWlCode()); wmsRawOrderInNewsSn.setUserDefined3("1"); - wmsOdsMateStorageNewsSnMapper.updateWmsOdsMateStorageNewsSnTWM(wmsRawOrderInNewsSn);//wms_ods_mate_storage_news_sn - wmsRawOrderInSn1.setUserDefined1("2"); - wmsRawOrderInSnMapper.updateWmsRawOrderInSn(wmsRawOrderInSn1); + wmsOdsMateStorageNewsSnMapper.deleteWmsOdsMateStorageNewsSnBycard(wmsRawOrderInNewsSn.getWlCode());//wms_ods_mate_storage_news_sn + wmsRawOrderInSn1.setUserDefined1("2");//直接删掉 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); + wmsOdsMateStorageNewsMapper.deleteWmsOdsMateStorageNewsBycard(wmsOdsMateStorageNews.getWlCode()); + //修改card + wmsOdsMateStorageNewsMapper.updateodsProcureOrderCard(wmsRawOrderInSn1.getUserDefined6()); } - wmsRawOrderIn.setOrderStatus("1"); - wmsRawOrderIn.setAccountingTime(new Date()); - wmsRawOrderIn.setAccountingMessage(result2.getMsg()); - wmsRawOrderIn.setUserDefined4(MATERIALDOCUMENT); - wmsRawOrderIn.setUserDefined5(MATDOCUMENTYEAR); + wmsRawOrderInSnMapper.deleteWmsRawOrderInByu5(wmsRawOrderIn.getDnNo(),wmsRawOrderIn.getKem());//---原材料收货明细 + wmsRawOrderIn.setOrderStatus("5");//冲销 + wmsRawOrderIn.setGmtModified(new Date()); + wmsRawOrderIn.setUserDefined9(result2.getMsg()); + wmsRawOrderIn.setUserDefined6(MATERIALDOCUMENT); + wmsRawOrderIn.setUserDefined7(MATDOCUMENTYEAR); wmsRawOrderInMapper.updateWmsRawOrderIn(wmsRawOrderIn); - + odsProcureOrderMapper.updateOdsProcureOrderBy(wmsRawOrderIn); }else { //失败了 - wmsRawOrderIn.setAccountingTime(new Date()); - wmsRawOrderIn.setAccountingMessage(result2.getMsg()); + wmsRawOrderIn.setGmtModified(new Date()); + wmsRawOrderIn.setUserDefined9(result2.getMsg()); wmsRawOrderInMapper.updateWmsRawOrderIn(wmsRawOrderIn); - } } return result; @@ -2763,6 +3023,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { return result; } + + // @Override // public String addReturnSC(List orderList) { // String factoryCode = orderList.get(0).getFactoryCode(); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsSnServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsSnServiceImpl.java index a77f6311c..de1d8b3ea 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsSnServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsSnServiceImpl.java @@ -160,7 +160,7 @@ public class WmsOdsMateStorageNewsSnServiceImpl implements IWmsOdsMateStorageNew */ @Override @DS("#header.poolName") - public String cardBD(List orderList) {// + public String cardBD(List orderList) { //获取当前所选工厂 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String key = "#header.poolName"; @@ -246,6 +246,27 @@ public class WmsOdsMateStorageNewsSnServiceImpl implements IWmsOdsMateStorageNew return msg; } + @Override + @DS("#header.poolName") + public String Removecard(List orderList) { + //获取当前所选工厂 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String msg="删除成功"; +// String factoryCode = request.getHeader(key.substring(8)).replace("ds_", ""); + for (OdsProcureOutOrder order: + orderList) { + //入参是物料，仓库，库区，数量，生成标识卡， + odsProcureOrderMapper.deleteBatchPalletBycard(order.getWlCode());//更具标识卡删除 + + wmsOdsMateStorageNewsMapper.deleteWmsOdsMateStorageNewsBycard(order.getWlCode()); + + wmsOdsMateStorageNewsSnMapper.deleteWmsOdsMateStorageNewsSnBycard(order.getWlCode()); + + } + return msg; + } + public String dayin( List orderList) { // 定义请求的URL地址 String url = dayinUrl1; diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml index cf325e2c4..1fb2c97d4 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml @@ -29,7 +29,7 @@ - select id, product_code, category, pc, iei, man_standar, spray_way, blank_diameter, blank_no, spray_volume, liquid_no, endometrial_dosage, outer_film_dosage, support, support_no, pvc, support_plate, pallet_num, other from base_product_attached + select id, product_code, category, pc, iei, man_standar, spray_way, blank_diameter, blank_no, spray_volume, liquid_no, endometrial_dosage, outer_film_dosage, support, support_no, pvc, support_plate, pallet_num, other,wa_code from base_product_attached @@ -106,6 +107,7 @@ pvc, support_plate, other, + wa_code, #{id}, @@ -130,6 +132,7 @@ #{pvc}, #{supportPlate}, #{other}, + #{waCode}, @@ -167,7 +170,8 @@ pack_type = #{packType}, category=#{category}, other=#{other}, - cpk_type=#{cpkType} + cpk_type=#{cpkType}, + wa_code=#{waCode} where id = #{id} diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml index 5bd939acb..5c710773c 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml @@ -73,6 +73,7 @@ + @@ -222,7 +223,8 @@ bpa.pvc, bpa.support_plate, bpa.other,bpa.warehouse_cycle,bpa.pallet_num palletNum, - bpa.pack_type,bpa.cpk_type + bpa.pack_type,bpa.cpk_type, + bpa.wa_code from base_product bp left join base_product_attached bpa on bpa.product_code = right(bp.product_code,11) where product_id = #{productId} 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 8a948b020..53fd5ddb1 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 @@ -41,6 +41,9 @@ + + + @@ -757,6 +760,9 @@ #{item.ID} + + delete from ods_procure_order_card where User_Defined1=#{wlCode} + + + update ods_procure_order + SET Order_Status = '1', + Reality_Number = COALESCE(Reality_Number, 0) - #{requestAmount} + where ID = #{kem} + + + + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml index bec2b2136..26e9f9743 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml @@ -382,7 +382,9 @@ delete from wms_ods_mate_storage_news where storage_id = #{storageId} - + + delete from wms_ods_mate_storage_news where wl_code = #{wlCode} + delete from wms_ods_mate_storage_news where storage_id in @@ -429,4 +431,9 @@ product_code = #{materialCode} + + update ods_procure_order_card + SET User_Defined10 = '0' + where User_Defined1 = #{userDefined6} + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml index 8df57e299..2f2925acd 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml @@ -238,7 +238,9 @@ delete from wms_ods_mate_storage_news_sn where mate_order_in_sn_id = #{mateOrderInSnId} - + + delete from wms_ods_mate_storage_news_sn where wl_code=#{wlCode} + delete from wms_ods_mate_storage_news_sn where mate_order_in_sn_id in diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml index b63ddacc3..809b44523 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml @@ -254,4 +254,7 @@ #{activeFlag} ) + + delete from wms_raw_order_in_sn where user_defined5 = #{dnNo} and user_defined3=#{kem} + From af915c1845257b83a8cda214eb248fc2056eafc3 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Fri, 29 Nov 2024 09:15:04 +0800 Subject: [PATCH 02/19] =?UTF-8?q?wms=E6=96=B0=E7=9A=84=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E4=BC=98=E5=8C=962=E5=92=8C=E7=94=9F=E4=BA=A7=E9=A2=86?= =?UTF-8?q?=E6=96=99bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsToWCSmissionController.java | 15 ++ .../com/op/wms/domain/OdsProcureOrder.java | 11 +- .../com/op/wms/mapper/BaseAreaMapper.java | 3 + .../wms/mapper/BaseProductAttachedMapper.java | 2 + .../op/wms/mapper/OdsProcureOrderMapper.java | 2 + .../wms/service/IOdsProcureOrderService.java | 2 + .../impl/OdsProcureOrderServiceImpl.java | 163 ++++++++++-------- .../resources/mapper/wms/BaseAreaMapper.xml | 10 +- .../mapper/wms/BaseProductAttachedMapper.xml | 9 +- .../mapper/wms/OdsProcureOrderMapper.xml | 9 + 10 files changed, 150 insertions(+), 76 deletions(-) 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} + + diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 1d11dbd64..b0c20b1a7 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -751,6 +751,20 @@ public class QcCheckTaskIncomeServiceImpl implements System.out.println("base_file:"+n); } + /**去掉测量值0**/ + String actualValueStr = detail.getActualValue(); + if(StringUtils.isNotBlank(actualValueStr)){ + if(actualValueStr.indexOf("[")>=0 && actualValueStr.indexOf("]")>=0){ + JSONArray codeArray = JSONArray.parseArray(actualValueStr); + for (int c1 = 0; c1 < codeArray.size(); c1++) { + if(codeArray.get(c1).toString().indexOf(":0")>=0&&codeArray.get(c1).toString().indexOf(".")<0) { + codeArray.remove(codeArray.get(c1)); + } + } + + detail.setActualValue(JSONArray.toJSONString(codeArray)); + } + } } if(qcCheckTaskIncome.getSampleQuality()!=null && qcCheckTaskIncome.getSampleQuality().equals(BigDecimal.ZERO)){ qcCheckTask.setSampleQuality(sampleQuality); @@ -1029,17 +1043,19 @@ public class QcCheckTaskIncomeServiceImpl implements System.out.println("base_file:"+n); } -// /**去掉测量值0**/ -// String actualValueStr = detail.getActualValue(); -// if(StringUtils.isNotBlank(actualValueStr)){ -// JSONArray codeArray = JSONArray.parseArray(actualValueStr); -// for (int c1 = 0; c1 < codeArray.size(); c1++) { -// if(codeArray.get(c1).toString().indexOf(":0")>=0&&codeArray.get(c1).toString().indexOf(".")<0) { -// codeArray.remove(codeArray.get(c1)); -// } -// } -// detail.setActualValue(codeArray.toJSONString()); -// } + /**去掉测量值0**/ + String actualValueStr = detail.getActualValue(); + if(StringUtils.isNotBlank(actualValueStr)){ + if(actualValueStr.indexOf("[")>=0 && actualValueStr.indexOf("]")>=0){ + JSONArray codeArray = JSONArray.parseArray(actualValueStr); + for (int c1 = 0; c1 < codeArray.size(); c1++) { + if(codeArray.get(c1).toString().indexOf(":0")>=0&&codeArray.get(c1).toString().indexOf(".")<0) { + codeArray.remove(codeArray.get(c1)); + } + } + detail.setActualValue(JSONArray.toJSONString(codeArray)); + } + } } if(qcCheckTaskIncome.getSampleQuality()!=null && qcCheckTaskIncome.getSampleQuality().equals(BigDecimal.ZERO)){ diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml index 929887afa..bd4f7f9e3 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml @@ -203,7 +203,8 @@ and inventory_number = #{inventoryNumber} and unit_measurement = #{unitMeasurement} and sap_code = #{sapCode} - and sap_name = #{sapName} + and (sap_name like concat('%',#{sapName},'%') or sap_code like concat('%',#{sapName},'%')) + and factory_workshop like concat('%', #{factoryWorkshop},'%') and del_flag ='0' diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml index 5c710773c..6ce004252 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml @@ -154,7 +154,11 @@ and bp.report_rate = #{reportRate} and bp.mvgr5 like concat('%', #{mvgr5},'%') and bpa.cpk_type =#{cpkType} - and bp.del_flag = '0' and bp.product_code not like '00000000%' + and bp.del_flag = '0' and ( + bp.product_code like '00000001%' or bp.product_code like '00000002%' or bp.product_code like '00000003%' + or bp.product_code like '00000004%' or bp.product_code like '00000005%' or bp.product_code like '00000006%' + or bp.product_code like '00000007%' + ) order by bp.product_code asc From c0f35d9c33c1d8081a934c9ce8313817c34e86d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com> Date: Tue, 3 Dec 2024 17:01:45 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E7=99=BD=E5=9D=AF=E5=8E=9F=E6=9D=90?= =?UTF-8?q?=E6=96=99=E5=85=A5=E5=BA=93=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/wms/BpProcureOrderMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BpProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BpProcureOrderMapper.xml index 7f2fe20ec..991590a61 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BpProcureOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BpProcureOrderMapper.xml @@ -22,7 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select ID, procure_code, material_code, material_name, supply_name, plan_number, reality_number, unit, price, attr1, attr2, attr3, attr4, attr5 from bp_procure_order + select ID, procure_code, material_code, material_name, supply_name, plan_number, reality_number, unit, price, attr1, attr2, attr3, attr4, attr5 from bp_procure_order ORDER BY + attr1 DESC @@ -43,11 +42,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and attr4 = #{attr4} and attr5 = #{attr5} + ORDER BY + attr1 DESC + insert into qc_check_task diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml index dc75e15a4..535873080 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -131,7 +131,7 @@ #{supplierName}, '%') and qct.income_time = #{incomeTime} - and qct.check_loc = #{checkLoc} + and qct.check_loc like concat('%',#{checkLoc}, '%') and qct.check_status = #{checkStatus} and qct.check_man_code = #{checkManCode} and qct.check_man_name like concat('%', diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml index 843a9b022..b776b2362 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml @@ -71,7 +71,7 @@ #{supplierName}, '%') and qct.income_time = #{incomeTime} - and qct.check_loc = #{checkLoc} + and qct.check_loc like concat('%',#{checkLoc}, '%') and qct.check_status = #{checkStatus} and qct.check_man_code = #{checkManCode} and qct.check_man_name like concat('%', diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcProductCpkUpdownMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProductCpkUpdownMapper.xml index d38098f5e..6a0f26575 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcProductCpkUpdownMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcProductCpkUpdownMapper.xml @@ -82,6 +82,36 @@ and material_code = #{materialCode} and rule_code = #{ruleCode} + insert into qc_product_cpk_updown diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml index e63921307..d67118ca1 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml @@ -531,7 +531,7 @@ qcp.rule_name ruleName from qc_check_type_project qctp left join qc_check_project qcp on qctp.project_id = qcp.id - where qctp.type_id = #{checkType} and qctp.property_code = '1' + where qctp.type_id = #{checkType} and qctp.property_code = '1' and qctp.del_flag = '0' and qctp.material_code is null and qcp.rule_name is not null +