Merge remote-tracking branch 'origin/master'

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-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/logistics/LogisticsInfosController.java

@@ -73,16 +73,16 @@ public class LogisticsInfosController {
      * 快递信息
      */
     @PostMapping("/getLogistics")
-    public KD100Result getLogistics(Long id) {
-        return logisticsInfosService.getLogistics(id);
+    public KD100Result getLogistics(@RequestBody BaseSelectDto dto) {
+        return logisticsInfosService.getLogistics(dto.getId());
     }
 
     /**
      * 更新物流状态
      */
     @PostMapping("/dataInfoEdit")
-    public void dataInfoEdit(Long id) {
-        logisticsInfosService.dataInfoEdit(id);
+    public void dataInfoEdit(@RequestBody BaseSelectDto dto) {
+        logisticsInfosService.dataInfoEdit(dto.getId());
     }
 
     /**

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/logistics/po/LogisticsDetails.java

@@ -36,9 +36,9 @@ public class LogisticsDetails extends BasePo {
     private Long purchaseId;
 
     /**
-     * 申购单id
+     * 采购明细id
      */
-    private Long applyPurchaseId;
+    private Long purchaseDetailsId;
 
     /**
      * 发货数量
@@ -55,4 +55,7 @@ public class LogisticsDetails extends BasePo {
      */
     private String remark;
 
+    /**业务明细id*/
+    private Long businessDetailsId;
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/deliver/impl/DeliverGoodsServiceImpl.java

@@ -2,28 +2,36 @@ package com.fjhx.victoriatourist.service.deliver.impl;
 
 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;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
+import com.fjhx.purchase.service.purchase.PurchaseService;
 import com.fjhx.victoriatourist.entity.deliver.dto.DeliverGoodsDto;
 import com.fjhx.victoriatourist.entity.deliver.dto.DeliverGoodsSelectDto;
 import com.fjhx.victoriatourist.entity.deliver.po.DeliverGoods;
 import com.fjhx.victoriatourist.entity.deliver.po.DeliverGoodsDetails;
 import com.fjhx.victoriatourist.entity.deliver.vo.DeliverGoodsDetailsVo;
 import com.fjhx.victoriatourist.entity.deliver.vo.DeliverGoodsVo;
+import com.fjhx.victoriatourist.entity.logistics.po.LogisticsDetails;
+import com.fjhx.victoriatourist.entity.logistics.po.LogisticsInfos;
 import com.fjhx.victoriatourist.mapper.deliver.DeliverGoodsMapper;
 import com.fjhx.victoriatourist.service.deliver.DeliverGoodsDetailsService;
 import com.fjhx.victoriatourist.service.deliver.DeliverGoodsService;
+import com.fjhx.victoriatourist.service.logistics.LogisticsDetailsService;
+import com.fjhx.victoriatourist.service.logistics.LogisticsInfosService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -47,6 +55,12 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
     ProductInfoService productInfoService;
     @Autowired
     PurchaseDetailService purchaseDetailService;
+    @Autowired
+    LogisticsInfosService logisticsInfosService;
+    @Autowired
+    LogisticsDetailsService logisticsDetailsService;
+    @Autowired
+    PurchaseService purchaseService;
 
     @Override
     public Page<DeliverGoodsVo> getPage(DeliverGoodsSelectDto dto) {
@@ -105,16 +119,42 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
         return deliverGoodsDetailsVos;
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    @DSTransactional
     @Override
     public void add(DeliverGoodsDto deliverGoodsDto) {
         deliverGoodsDto.setStatus(0);//设置未到货
         this.save(deliverGoodsDto);
+
+        //获取采购信息
+        Purchase purchase = purchaseService.getById(deliverGoodsDto.getPurchaseId());
+        //创建物流信息
+        LogisticsInfos logisticsInfos = new LogisticsInfos();
+        logisticsInfos.setBusinessId(deliverGoodsDto.getId());//设置业务id为发货id
+        logisticsInfos.setBusinessCode(purchase.getCode());//设置采购单号为业务单号
+        logisticsInfos.setBusinessType(1);//采购到货
+        logisticsInfos.setStatus(0);
+        logisticsInfos.setInStockStatus(10);
+        logisticsInfos.setCode(deliverGoodsDto.getCode());
+        logisticsInfos.setLogisticsCompanyCode(deliverGoodsDto.getLogisticsCompanyCode());
+        logisticsInfos.setIsKd100(0);
+        logisticsInfosService.save(logisticsInfos);
+
         List<DeliverGoodsDetails> deliverGoodsDetailsList = deliverGoodsDto.getDeliverGoodsDetailsList();
+        List<LogisticsDetails> logisticsDetailsList = new ArrayList<>();
+
         for (DeliverGoodsDetails deliverGoodsDetails : deliverGoodsDetailsList) {
             deliverGoodsDetails.setDeliverGoodsId(deliverGoodsDto.getId());
+
+            LogisticsDetails logisticsDetails = new LogisticsDetails();
+            logisticsDetails.setBusinessDetailsId(deliverGoodsDetails.getId());//设置发货明细id为业务id
+            logisticsDetails.setLogisticsInfoId(logisticsInfos.getId());
+            logisticsDetails.setPurchaseId(purchase.getId());
+            logisticsDetails.setPurchaseDetailsId(deliverGoodsDetails.getPurchaseDetailId());
+            logisticsDetails.setShipmentQuantity(deliverGoodsDetails.getDeliverGoodsQuantity());
+            logisticsDetailsList.add(logisticsDetails);
         }
         deliverGoodsDetailsService.saveBatch(deliverGoodsDetailsList);
+        logisticsDetailsService.saveBatch(logisticsDetailsList);
     }
 
     @Override

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/logistics/impl/LogisticsInfosServiceImpl.java

@@ -26,6 +26,7 @@ import com.fjhx.victoriatourist.service.logistics.LogisticsDetailsService;
 import com.fjhx.victoriatourist.service.logistics.LogisticsInfosService;
 import com.fjhx.victoriatourist.utils.Assert;
 import com.fjhx.victoriatourist.utils.LogisticsConstant;
+import com.fjhx.wms.entity.stock.vo.StockVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
@@ -69,7 +70,7 @@ public class LogisticsInfosServiceImpl extends ServiceImpl<LogisticsInfosMapper,
         Page<LogisticsInfosVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<LogisticsInfosVo> records = page.getRecords();
         //赋值物流公司名字
-        List<String> codes = records.stream().map(LogisticsInfosVo::getCode).collect(Collectors.toList());
+        List<String> codes = records.stream().map(LogisticsInfosVo::getLogisticsCompanyCode).collect(Collectors.toList());
         if (ObjectUtil.isEmpty(codes)) {
             return page;
         }

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/StockJournalDetailsServiceImpl.java

@@ -50,6 +50,7 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
         wrapper.eq("w.id",dto.getWarehouseId());
         wrapper.eq("sj.to_warehouse_id",dto.getToWarehouseId());
         wrapper.eq("sjd.product_id",dto.getProductId());
+        wrapper.orderByDesc("sj", StockJournal::getCreateTime);
         Page<StockJournalDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<StockJournalDetailsVo> records = page.getRecords();
         // 赋值产品属性

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,