问题处理

hx-supply/src/main/java/com/fjhx/supply/service/supplier/impl/SupplierInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fjhx.supply.service.supplier.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -53,7 +54,9 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
         return page;
     }
 
-    /**供应商分页维多利亚用*/
+    /**
+     * 供应商分页维多利亚用
+     */
     @Override
     public Page<SupplierInfoVo> getPageByWdly(SupplierInfoSelectDto dto) {
         IWrapper<SupplierInfo> wrapper = getWrapper();
@@ -64,7 +67,17 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
                 new SqlField("si", SupplierInfo::getCode)
         );
         //根据账期过滤
-        wrapper.eq("json_unquote( si.victoriatourist_json -> '$.accountPeriod' )",dto.getAccountPeriodType());
+        Integer accountPeriodType = dto.getAccountPeriodType();
+        if (ObjectUtil.isNotEmpty(accountPeriodType)) {
+            if (1 == accountPeriodType) {
+                wrapper.isNotNull("json_unquote( si.victoriatourist_json -> '$.accountPeriod' )");
+                wrapper.apply("json_unquote( si.victoriatourist_json -> '$.accountPeriod' ) !=''");
+            } else {
+                wrapper.isNull("json_unquote( si.victoriatourist_json -> '$.accountPeriod' )");
+                wrapper.or();
+                wrapper.apply("json_unquote( si.victoriatourist_json -> '$.accountPeriod' ) =''");
+            }
+        }
         Page<SupplierInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 
         List<SupplierInfoVo> records = page.getRecords();

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockCheckServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fjhx.wms.service.stock.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -74,6 +75,9 @@ public class StockCheckServiceImpl extends ServiceImpl<StockCheckMapper, StockCh
         StockCheckVo stockCheckVo = baseMapper.detail(id);
 
         List<StockCheckDetailsVo> list = stockCheckVo.getList();
+        if(ObjectUtil.isEmpty(list)){
+            return stockCheckVo;
+        }
         productInfoService.attributeAssign(list, StockCheckDetails::getProductId, (item, product) -> {
             item.setProductCode(product.getCode());
             item.setProductName(product.getName());

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -169,13 +169,11 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
     @Override
     public void add(StockWaitDto stockWaitDto) {
         //更新已入库数量 根据明细id
-//        StockWait byId = getById(stockWaitDto.getId());
-        StockWaitDetails stockWaitDetails = stockWaitDetailsService.getById(stockWaitDto.getId());
+        StockWaitDetails stockWaitDetails = stockWaitDetailsService.getOne(q->q.eq(StockWaitDetails::getStockWaitId,stockWaitDto.getId()));
         stockWaitDetails.setReceiptQuantity(stockWaitDetails.getReceiptQuantity().add(stockWaitDto.getQuantity()));
         if (stockWaitDetails.getReceiptQuantity().compareTo(stockWaitDetails.getQuantity()) > 0) {
             throw new ServiceException("入库数量+已入库数量不能大于待采购数量");
         }
-//        updateById(byId);
         stockWaitDetailsService.updateById(stockWaitDetails);
         StockWait byId = getById(stockWaitDetails.getStockWaitId());
         //创建出入库记录

hx-wms/src/main/resources/mapper/stock/StockCheckMapper.xml

@@ -19,6 +19,9 @@
 
     <resultMap id="detail" type="com.fjhx.wms.entity.stock.vo.StockCheckVo">
         <id property="id" column="id"/>
+        <id property="result" column="result"/>
+        <id property="warehouseId" column="warehouse_id"/>
+        <id property="createTime" column="create_time"/>
         <result property="warehouseName" column="warehouseName"/>
         <collection property="list" javaType="java.util.ArrayList" ofType="com.fjhx.wms.entity.stock.vo.StockCheckDetailsVo">
             <id property="id" column="stockCheckDetails"/>
@@ -31,16 +34,18 @@
     <select id="detail" resultMap="detail">
         SELECT
             sc.id,
+            sc.result,
             sc.warehouse_id,
-            w.`name` warehouseName,
-            scd.id stockCheckDetails,
+            w.`name` warehousename,
+            scd.id stockcheckdetails,
             scd.product_id,
             scd.quantity,
-            scd.check_quantity
+            scd.check_quantity,
+            sc.create_time
         FROM
             stock_check sc
-                JOIN stock_check_details scd ON scd.stock_check_id = sc.id
-                JOIN warehouse w ON sc.warehouse_id = w.id where sc.id = #{id}
+                LEFT JOIN stock_check_details scd ON scd.stock_check_id = sc.id
+                LEFT JOIN warehouse w ON sc.warehouse_id = w.id where sc.id = #{id}
     </select>
 
 </mapper>

hx-wms/src/main/resources/mapper/stock/StockWaitMapper.xml

@@ -3,12 +3,11 @@
 <mapper namespace="com.fjhx.wms.mapper.stock.StockWaitMapper">
     <select id="getPage" resultType="com.fjhx.wms.entity.stock.vo.StockWaitVo">
         SELECT
-            swd.id,
+            sw.id,
             sw.type,
             sw.business_id,
             sw.business_code,
             sw.business_type,
-            swd.stock_wait_id,
             swd.product_id,
             swd.quantity,
             swd.receipt_quantity,