From 4bd3ca5c5c909d21d736a650c66800078231b6e2 Mon Sep 17 00:00:00 2001
From: "djz236@163.com" <djz236@163.com>
Date: Tue, 15 Aug 2023 22:06:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/instorehouse/InStorehouseMainService.java      | 10 ++++------
 .../api/outstorehouse/OutStorehouseMainService.java    |  3 ++-
 .../com/wh/service/api/prodstock/ProdStockService.java |  3 ---
 .../com/wh/service/purchasenew/PurchasenewService.java |  3 +--
 .../main/resources/mappers/OutStorehouseMainMapper.xml |  3 ++-
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java
index c65bfe92..c1c90176 100644
--- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java
@@ -133,8 +133,6 @@ public class InStorehouseMainService  extends MybatisBaseService<InStorehouseMai
         one.setState(2);
         one.setModifyTime(new Date());
         purchasenewService.updateById(one);
-
-
         //purchasenewService.updateStateToInputBySid(in.getPurchaseSid());
         return ResultBean.fireSuccess().setMsg("添加成功");
 
@@ -215,14 +213,14 @@ public class InStorehouseMainService  extends MybatisBaseService<InStorehouseMai
          //  log.info("{}",l.getProName()+"商品数量不能为空");
         }
         BigDecimal i=new BigDecimal(num).add(new BigDecimal(l.getNum()));
-        prodStock.setNum(l.getNum());
-        prodStock.setConfirmedPrice(prodStock.getConfirmedPrice());
+       // prodStock.setNum(l.getNum());
+        prodStock.setConfirmedPrice(l.getConfirmedPrice());
+        prodStock.setNum(i.toString()); // TODO 当系统调试通后需要做修改 将下一行代码注释去掉
         BigDecimal multiply = new BigDecimal(prodStock.getNum()).multiply(new BigDecimal(prodStock.getConfirmedPrice()));
         prodStock.setCalculatedValue(multiply.toString());
         prodStock.setStoreHouseName(l.getStoreHouseName());
         prodStock.setStoreHouseSid(l.getStoreHouseSid());
-        // TODO 当系统调试通后需要做修改 将下一行代码注释去掉
-       // prodStock.setNum(i.toString());
+        prodStock.setModifyTime(new Date());
         prodStockService.updateById(prodStock);
     }
 
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 208c1270..fb531f07 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
@@ -229,7 +229,7 @@ public class OutStorehouseMainService extends MybatisBaseService<OutStorehouseMa
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wraInStorehouseMainpper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<OutStorehouseVo> qw = new QueryWrapper<>();
-
+        qw.eq("1",1);
         if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getNo())) {
             qw.like("no", query.getNo());
         }
@@ -248,6 +248,7 @@ public class OutStorehouseMainService extends MybatisBaseService<OutStorehouseMa
         if (StrUtil.isNotBlank(query.getState())) {
             qw.like("state", query.getState());
         }
+        qw.orderByDesc("id");
         return qw;
     }
 
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 f867382c..93295eb1 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
@@ -58,9 +58,6 @@ public class ProdStockService extends MybatisBaseService<ProdStockMapper, ProdSt
         if (StringUtils.isNotBlank(query.getProName())) {
             qw.eq("pro_name", query.getProName());
         }
-        if (StringUtils.isNotBlank(query.getProName())) {
-            qw.eq("pro_name", query.getProName());
-        }
         if (StringUtils.isNotBlank(query.getProModel())) {
             qw.eq("pro_model", query.getProModel());
         }
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java
index d119b29f..bf30a6ce 100644
--- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java
@@ -146,8 +146,7 @@ public class PurchasenewService extends MybatisBaseService<PurchasenewMapper, Pu
         //dto.setSid(entity.getSid());
         purchasenewProductService.deleteByPurchaseSid(dtoSid);
         addPurchasenewProduct(dto, rb, entity);
-        // TODO 当系统调试通后需要做修改 不能再 执行下一行代码了
-        return inStorehouseMainService.saveOrUpdateByPurchaseSid(dto,entity.getSid());
+        return rb.success();//inStorehouseMainService.saveOrUpdateByPurchaseSid(dto,entity.getSid());// TODO 当系统调试通后需要做修改 不能再 执行下一行代码了
     }
 
     private ResultBean addPurchasenewProduct(PurchasenewDto dto, ResultBean rb, Purchasenew entity) {
diff --git a/warehousing-system/project/wh-manage/src/main/resources/mappers/OutStorehouseMainMapper.xml b/warehousing-system/project/wh-manage/src/main/resources/mappers/OutStorehouseMainMapper.xml
index 2533f09e..09d38930 100644
--- a/warehousing-system/project/wh-manage/src/main/resources/mappers/OutStorehouseMainMapper.xml
+++ b/warehousing-system/project/wh-manage/src/main/resources/mappers/OutStorehouseMainMapper.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.wh.mapper.api.outstorehouse.OutStorehouseMainMapper">
     <select id="selectPageVo" resultType="com.wh.pojo.api.OutStorehouseVo">
-        SELECT osm.* ,(select count(1) from out_storehouse_listing where main_sid=osm.sid ) prod_num FROM out_storehouse_main osm <where> ${ew.sqlSegment} </where>
+        SELECT osm.* ,(select count(1) from out_storehouse_listing where main_sid=osm.sid ) prod_num FROM out_storehouse_main osm
+         <where> ${ew.sqlSegment} </where>
     </select>
 </mapper>
\ No newline at end of file