From 1aaa79699a5c04d16913bb1943430ae7a0196d8a Mon Sep 17 00:00:00 2001 From: "djz236@163.com" Date: Wed, 2 Aug 2023 22:50:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E7=9A=84=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/wh/pojo/api/OutStorehouseListing.java | 2 ++ .../api/output/OutStorehouseMainController.java | 10 +++++++--- .../wh/mapper/api/prodstock/ProdStockMapper.java | 4 +++- .../api/outstorehouse/OutStorehouseMainService.java | 13 +++++++++++++ .../wh/service/api/prodstock/ProdStockService.java | 3 +++ 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseListing.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseListing.java index 4e23cba6..361486c1 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseListing.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseListing.java @@ -22,6 +22,8 @@ public class OutStorehouseListing extends BaseEntity { private String storeHouseName ;//varchar 100 仓库名称 @NotBlank(message = "质物名称不能为空") private String proName;// varchar 50 质物名称 + @NotBlank(message = "质物名称不能为空") + private String proSid;// varchar 50 质物sid @NotBlank(message = "规格（型号）不能为空") private String proModel ;//varchar 50 规格（型号） private String proUnit ;//varchar 50 规格单位 diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/output/OutStorehouseMainController.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/output/OutStorehouseMainController.java index 656e2c75..dd5a240d 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/output/OutStorehouseMainController.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/output/OutStorehouseMainController.java @@ -1,6 +1,7 @@ package com.wh.controller.api.output; import com.wh.pojo.api.*; +import com.wh.pojo.purchasenew.Purchasenew; import com.wh.service.api.outstorehouse.OutStorehouseListingService; import com.wh.service.api.outstorehouse.OutStorehouseMainService; import com.wh.vo.SysResult; @@ -43,10 +44,13 @@ public class OutStorehouseMainController { public ResultBean delBySids(@RequestBody String[] sids){ ResultBean rb = ResultBean.fireFail(); for (String sid : sids) { - int i = outStorehouseMainService.deleteBySid(sid); - int ii=outStorehouseListingService.deleteByMainSid(sid); + outStorehouseMainService.fetchBySid(sid) + int state = entity.getState(); + if(2==state){ + continue; + } + int i = outStorehouseMainService.deleteOutStorehouseMainBySid(sid); } - return rb.success(); } } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/prodstock/ProdStockMapper.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/prodstock/ProdStockMapper.java index 8714fd2c..b2ee0e4f 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/prodstock/ProdStockMapper.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/prodstock/ProdStockMapper.java @@ -8,7 +8,9 @@ import org.apache.ibatis.annotations.Update; public interface ProdStockMapper extends BaseMapper { - @Update("update prod_stock set num=num-#{num} where pro_sid=#{proSid} and custer_sid=#{custerSid}") + @Update("update prod_stock set num=num-#{num} , calculated_value=(num*confirmed_price) where pro_sid=#{proSid} and custer_sid=#{custerSid}") void reduceNumByProdSidAndCustSid(@Param("proSid") String proSid, @Param("custerSid")String custerSid, @Param("num")String num); + @Update("update prod_stock set num=num+#{num}, calculated_value=(num*confirmed_price) where pro_sid=#{proSid} and custer_sid=#{custerSid}") + void addNumByProdSidAndCustSid(String proSid, String custerSid, String num); } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/outstorehouse/OutStorehouseMainService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/outstorehouse/OutStorehouseMainService.java index 4effd3b5..a45034b0 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/outstorehouse/OutStorehouseMainService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/outstorehouse/OutStorehouseMainService.java @@ -19,6 +19,7 @@ import com.wh.mapper.storehousemanage.RemoveMapper; import com.wh.pojo.*; import com.wh.pojo.api.*; import com.wh.service.api.instorehouse.InStorehouseListingService; +import com.wh.service.api.instorehouse.InStorehouseMainService; import com.wh.service.api.prodstock.ProdStockService; import com.wh.vo.PageResult; import com.yxt.common.base.service.MybatisBaseService; @@ -44,6 +45,8 @@ public class OutStorehouseMainService extends MybatisBaseService r = ResultBean.fireFail(); @@ -216,4 +219,14 @@ public class OutStorehouseMainService extends MybatisBaseService list=outStorehouseListingService.selectInStorehouseListingsByMainSid(sid); + int ii=outStorehouseListingService.deleteByMainSid(sid); + list.forEach(l->{ + prodStockService.addNumByProdSidAndCustSid(l.getProSid(), l.getCusterSid(),l.getRealityNum()); + }); + return i; + } } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java index 218ef793..b01e4fd2 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java @@ -63,4 +63,7 @@ public class ProdStockService extends MybatisBaseService