完善功能

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);
     }
 

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;
     }
 

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());
         }

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) {

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>