From 36cf3ed50852feae333c85be06c67d343065e1db Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 16 Jan 2025 14:25:44 +0800 Subject: [PATCH] =?UTF-8?q?wms=E6=88=90=E5=93=81=E9=94=80=E5=94=AE?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=9F=E6=88=90=E5=A4=87=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=89=8D=E7=AB=AF=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=8D=95=E5=AD=90=EF=BC=8C=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=89=80=E4=BB=A5=E9=A1=B9=EF=BC=8C=E5=B9=B6=E4=B8=94=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=AF=B9=E5=BA=94=E7=9A=84=E5=BA=93=E5=AD=98=EF=BC=8C?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=BA=93=E5=AD=98=E7=9A=84=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=8C=E9=99=90=E5=88=B6=E6=97=A0=E9=99=90?= =?UTF-8?q?=E7=94=9F=E6=88=90=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsSellOutEmbryoController.java | 2 - .../wms/mapper/WmsFpStorageNewsSnMapper.java | 2 + .../op/wms/mapper/WmsSellOutEmbryoMapper.java | 5 + .../impl/WmsProductPutServiceImpl.java | 1 + .../impl/WmsSellOutEmbryoServiceImpl.java | 130 +++++++++++++----- .../mapper/wms/WmsFpStorageNewsSnMapper.xml | 12 +- .../mapper/wms/WmsSellOutEmbryoMapper.xml | 11 ++ 7 files changed, 127 insertions(+), 36 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java index 59babba3..76c2b1ae 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java @@ -146,8 +146,6 @@ public class WmsSellOutEmbryoController extends BaseController { return R.ok(); } - - @PostMapping("/addRE") public AjaxResult addRE(@RequestBody List wmsSellOutEmbryoList) { return success(wmsSellOutEmbryoService.addRE(wmsSellOutEmbryoList)); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java index ca117b2c..ee75b06e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java @@ -97,4 +97,6 @@ public interface WmsFpStorageNewsSnMapper { List selectwmsFpStorageNewsGroupWaCode(@Param("productCode")String productCode); List selectWmsFpStorageNewsSnRecordsList(WmsFpStorageNewsSn wmsFpStorageNewsSn); + + void updateWmsFpStorageNewsSnsetZT(WmsFpStorageNewsSn wmsFpStorageNewsSn1); } 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 a6bd4f69..d3ccb15c 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 @@ -1,5 +1,6 @@ package com.op.wms.mapper; +import java.math.BigDecimal; import java.util.List; import com.op.wms.domain.WmsAllocationOutEmbryo; @@ -105,4 +106,8 @@ public interface WmsSellOutEmbryoMapper { public WmsSellOutEmbryo selectWmsSellOutEmbryoByIdRE(String id); List selectWmsSellOutEmbryoListRE(WmsSellOutEmbryo wmsSellOutEmbryo); + + void updateWmsSellOutEmbryoAddOut(@Param("wmsSellOutEmbryo")WmsSellOutEmbryo wmsSellOutEmbryo,@Param("planQuantity") BigDecimal planQuantity); + + List selectWmsSellOutEmbryoListZT(WmsSellOutEmbryo wmsSellOutEmbryo1); } 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 71d48320..4fe7916d 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 @@ -872,6 +872,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsFpStorageNewsSn1.setActiveFlag("1"); wmsFpStorageNewsSn1.setProductCode(wmsSellOutEmbryo1.getProductCode()); wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSnOut(wmsFpStorageNewsSn1); + wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSnsetZT(wmsFpStorageNewsSn1); WmsFpStorageNewsSn wmsFpStorageNewsSn2= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnByStorageId(wmsFpStorageNewsSn.getStorageId()); WmsFpStorageNewsSn wmsFpStorageNewsSn3=new WmsFpStorageNewsSn(); wmsFpStorageNewsSn3.setStorageId(IdUtils.fastSimpleUUID()); 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 359c7708..69dc4a3b 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 @@ -162,46 +162,112 @@ public class WmsSellOutEmbryoServiceImpl implements IWmsSellOutEmbryoService { return wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoREList(wmsSellOutEmbryo); } + /** + * 在原来的基础上修改改成，让他们前端进行操作，只选择一个单号即可， + * @param wmsSellOutEmbryoList + * @return + */ @Override @DS("#header.poolName") 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); + //销售出库界面同一笔交货单可以生成多笔备货单，无限制，进行限制，防止重复生成---即要对wms_sell_out_embryo页面进行修改 + String result=""; + Integer ten=0; + List wmsSellOutEmbryos=new ArrayList<>(); for (WmsSellOutEmbryo wmsSellOutEmbryo: wmsSellOutEmbryoList) { WmsSellOutEmbryo wmsSellOutEmbryo1= wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoById(wmsSellOutEmbryo.getId()); - String productCode =wmsSellOutEmbryo1.getProductCode(); - BigDecimal planQuantity = wmsSellOutEmbryo1.getPlanQuantity(); - List wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectwmsFpStorageNewsGroupWaCode(productCode); - if (wmsFpStorageNewsSns.size()<1){ - return productCode+"无库存"; - } - String stock= wmsSellOutEmbryoMapper.selectwmsFpStorageNewsTS(formattedDate); - //区分大小planQuantity - for ( WmsFpStorageNewsSn wmsFpStorageNewsSn: wmsFpStorageNewsSns){ - BigDecimal tem= wmsFpStorageNewsSn.getAmount();//数量 - //planQuantity看成总数量 - if(planQuantity.compareTo(tem)<=0){ - //生成一个 - wmsSellOutEmbryo1.setStockOrder("BH"+stock); - wmsSellOutEmbryo1.setWaCode(wmsFpStorageNewsSn.getWaCode()); - wmsSellOutEmbryo1.setPlanQuantity(planQuantity); - wmsSellOutEmbryo1.setId(IdUtils.fastSimpleUUID()); - wmsSellOutEmbryoMapper.insertWmsSellOutEmbryoOrder(wmsSellOutEmbryo1); - 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插入到数据库 + wmsSellOutEmbryo1.getDeliveryOrder(); + wmsSellOutEmbryos.add(wmsSellOutEmbryo1); + } + //去重 + // 创建一个 HashSet 用于存储已经遇到的交付订单号，以便进行去重 + Set deliveryOrderSet = new HashSet<>(); + List wmsSellOutEmbryoList1=new ArrayList<>(); + for (WmsSellOutEmbryo wmsSellOutEmbryo: + wmsSellOutEmbryos){ + String wmsSellOutEmbryoDeliveryOrder= wmsSellOutEmbryo.getDeliveryOrder(); + // 检查交付订单号是否已经存在于 deliveryOrderSet 中 + if (!deliveryOrderSet.contains(wmsSellOutEmbryoDeliveryOrder)) { + // 如果交付订单号不存在，则将其添加到 deliveryOrderSet 中 + deliveryOrderSet.add(wmsSellOutEmbryoDeliveryOrder); + + // 将当前 WmsSellOutEmbryo 对象添加到 wmsSellOutEmbryoList1 中 + wmsSellOutEmbryoList1.add(wmsSellOutEmbryo); + } + } + + for (WmsSellOutEmbryo wmsSellOutEmbryo: + wmsSellOutEmbryoList1) { + //选一个单子，把单子的全部项都生成 + WmsSellOutEmbryo wmsSellOutEmbryo1=new WmsSellOutEmbryo(); + wmsSellOutEmbryo1.setDeliveryOrder(wmsSellOutEmbryo.getDeliveryOrder()); + List wmsSellOutEmbryoList2= wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoListZT(wmsSellOutEmbryo1); + // String stockOrder="BH"; + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); + + Date date = new Date(); + String formattedDate = dateFormat.format(date); + //wmsSellOutEmbryoList2是我根据入参去重后，查询出来的所有数据 + for (WmsSellOutEmbryo wmsSellOutEmbryo2: + wmsSellOutEmbryoList2) { + String productCode =wmsSellOutEmbryo2.getProductCode(); + BigDecimal planQuantity = wmsSellOutEmbryo2.getPlanQuantity(); + List wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectwmsFpStorageNewsGroupWaCode(productCode); + if (wmsFpStorageNewsSns.size()<1){//没有库存，就就跳过，但是要记录，对前端进行提示 + ten= ten+1; + result=result+","+productCode; + continue; + } + String stock= wmsSellOutEmbryoMapper.selectwmsFpStorageNewsTS(formattedDate); + //区分大小planQuantity + for ( WmsFpStorageNewsSn wmsFpStorageNewsSn: wmsFpStorageNewsSns){ + BigDecimal tem= wmsFpStorageNewsSn.getAmount();//数量 + //planQuantity看成总数量 + if(planQuantity.compareTo(tem)<=0){ + //生成一个 + wmsSellOutEmbryoMapper.updateWmsSellOutEmbryoAddOut(wmsSellOutEmbryo2,planQuantity);//对订单进行修改--添加出库数量 + wmsSellOutEmbryo2.setStockOrder("BH"+stock); + wmsSellOutEmbryo2.setWaCode(wmsFpStorageNewsSn.getWaCode()); + wmsSellOutEmbryo2.setPlanQuantity(planQuantity); + wmsSellOutEmbryo2.setId(IdUtils.fastSimpleUUID()); + wmsSellOutEmbryoMapper.insertWmsSellOutEmbryoOrder(wmsSellOutEmbryo2); + return result; + }else { + wmsSellOutEmbryoMapper.updateWmsSellOutEmbryoAddOut(wmsSellOutEmbryo2,tem); + wmsSellOutEmbryo2.setStockOrder("BH"+stock); + planQuantity = planQuantity.subtract(tem); // 用总数量减去tem，更新planQuantity的值 + wmsSellOutEmbryo2.setWaCode(wmsFpStorageNewsSn.getWaCode()); // 设置wmsSellOutEmbryo2的waCode为当前wmsFpStorageNewsSn的waCode + wmsSellOutEmbryo2.setPlanQuantity(tem); // 将tem的值赋给wmsSellOutEmbryo2的planQuantity + wmsSellOutEmbryo2.setId(IdUtils.fastSimpleUUID()); // 生成一个唯一ID并设置到wmsSellOutEmbryo2的ID字段 + wmsSellOutEmbryoMapper.insertWmsSellOutEmbryoOrder(wmsSellOutEmbryo2); // 将wmsSellOutEmbryo2插入到数据库 + } } } + + } +// +// +// +// //TH ods_procure_order_card +// +// +// for (WmsSellOutEmbryo wmsSellOutEmbryo: +// wmsSellOutEmbryoList) { +// WmsSellOutEmbryo wmsSellOutEmbryo1= wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoById(wmsSellOutEmbryo.getId()); +// String productCode =wmsSellOutEmbryo1.getProductCode(); +// BigDecimal planQuantity = wmsSellOutEmbryo1.getPlanQuantity(); +// List wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectwmsFpStorageNewsGroupWaCode(productCode); +// if (wmsFpStorageNewsSns.size()<1){ +// return productCode+"无库存"; +// } +// String stock= wmsSellOutEmbryoMapper.selectwmsFpStorageNewsTS(formattedDate); +// +// } + if (ten>0){ + return result+"没有对应订单库存"; + }else { + result="完成"; } return result; } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml index c5823bcd..5427e9ea 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml @@ -379,6 +379,11 @@ WHERE storage_id = #{storageId} AND active_flag = '1'; + + UPDATE wms_fp_storage_news_sn SET user_defined1 = CASE WHEN amount > out_amount THEN 1 WHEN amount = out_amount THEN 2 ELSE user_defined1 -- 保持原值，如果不满足条件 + END WHERE storage_id = #{ storageId } + AND active_flag = '1'; + @@ -511,10 +516,11 @@ product_code, sn, bar_code, - COALESCE(amount, 0) amount, + COALESCE(amount, 0) -COALESCE(out_amount, 0) amount, -- 实际数量 batch_number, COALESCE(user_defined1, 0) AS user_defined1, -- 如果为空则返回0 COALESCE(user_defined2, 0) AS user_defined2, -- 如果为空则返回0 + COALESCE(out_amount, 0) AS outAmount, -- 如果为空则返回0 user_defined3, user_defined4, user_defined5, @@ -577,7 +583,9 @@ WHERE product_code like concat('%',#{productCode} , '%') - AND wh_code='0021' + AND wh_code='0021' and 0 + ]]> GROUP BY wa_code, wh_code, 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 004aa8af..515cde5c 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 @@ -1076,4 +1076,15 @@ + + UPDATE wms_sell_out_embryo + SET out_quantity = COALESCE(out_quantity, 0) + #{planQuantity} + WHERE id = #{wmsSellOutEmbryo.id} + AND active_flag = '1'; + + +