维多利亚已采购

hx-purchase/src/main/java/com/fjhx/purchase/service/WdlyService.java

@@ -0,0 +1,6 @@
+package com.fjhx.purchase.service;
+
+public interface WdlyService {
+    /**修改发货记录为到货*/
+    void updateDeliverGoodsStatus(Long id);
+}

hx-purchase/src/main/java/com/fjhx/purchase/service/arrival/impl/ArrivalServiceImpl.java

@@ -2,6 +2,8 @@ package com.fjhx.purchase.service.arrival.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,6 +16,7 @@ import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
 import com.fjhx.purchase.entity.arrival.vo.ArrivalVo;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.mapper.arrival.ArrivalMapper;
+import com.fjhx.purchase.service.WdlyService;
 import com.fjhx.purchase.service.arrival.ArrivalDetailService;
 import com.fjhx.purchase.service.arrival.ArrivalService;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
@@ -116,21 +119,6 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
             }
             arrivalDetailService.saveBatch(arrivalDetailList);
             stockWaitService.saveBatch(stockWaitList);
-            //维多利亚扩展修改
-            if (ObjectUtil.isNotEmpty(arrival.getVictoriatouristJson())) {
-                //创建待入库记录、
-                for (ArrivalDetail d : arrivalDetailList) {
-                    d.setArrivalId(arrival.getId());
-                    StockWait stockWait = new StockWait();
-                    stockWait.setProductId(d.getBussinessId());
-                    stockWait.setBusinessId(d.getId());//到货明细ID
-                    stockWait.setType(1);//入库
-                    stockWait.setStatus(0);//待入库
-                    stockWait.setBusinessType(3);//采购到货
-                    stockWait.setQuantity(d.getCount());
-                    stockWaitList.add(stockWait);
-                }
-            }
         }
     }
 
@@ -149,7 +137,12 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
         purchaseService.updateById(purchase);
         //创建待入库记录
         String victoriatouristJson = arrival.getVictoriatouristJson();
-//        JSONObject json = JSONObject.parseObject(victoriatouristJson);
+        JSONObject json = JSONObject.parseObject(victoriatouristJson);
+        //修改发货记录的状态为到货
+        Long deliverGoodsId = json.getLong("deliverGoodsId");
+        WdlyService wdly = SpringUtil.getBean(WdlyService.class);
+        wdly.updateDeliverGoodsStatus(deliverGoodsId);
+        //----------
         StockWait stockWait = new StockWait();
         stockWait.setType(1);//入库
         stockWait.setStatus(0);//待入库

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/WdlyServiceImpl.java

@@ -0,0 +1,21 @@
+package com.fjhx.victoriatourist.service;
+
+import cn.hutool.extra.spring.SpringUtil;
+import com.fjhx.purchase.service.WdlyService;
+import com.fjhx.purchase.service.sales.SalesReturnService;
+import com.fjhx.victoriatourist.entity.deliver.po.DeliverGoods;
+import com.fjhx.victoriatourist.service.deliver.DeliverGoodsService;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class WdlyServiceImpl implements WdlyService {
+    /**更新发货记录的状态为到货*/
+    @Override
+    public void updateDeliverGoodsStatus(Long id) {
+        DeliverGoodsService deliverGoodsService = SpringUtil.getBean(DeliverGoodsService.class);
+
+        DeliverGoods byId = deliverGoodsService.getById(id);
+        byId.setStatus(1);
+        deliverGoodsService.updateById(byId);
+    }
+}

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

@@ -60,8 +60,8 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
     public List<DeliverGoodsDetailsVo> detail(Long id) {
         //根据发货id查发货明细
         IWrapper<DeliverGoods> wrapper = IWrapper.getWrapper();
-        wrapper.eq(DeliverGoods::getId, id);
-        wrapper.eq(DeliverGoods::getStatus, 0);
+        wrapper.eq("dgd.deliver_goods_id", id);
+        wrapper.eq("dg.status", 0);
         List<DeliverGoodsDetailsVo> deliverGoodsDetailsVos = baseMapper.listDeliverGoodsDetails(wrapper);
         //获取采购明细列表
         //赋值产品信息
@@ -92,7 +92,7 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
             IWrapper<DeliverGoods> wrapper1 = IWrapper.getWrapper();
             wrapper1.eq("dgd",DeliverGoodsDetails::getPurchaseDetailId, deliverGoodsDetailsVo.getPurchaseDetailId());
             wrapper1.eq("dg.status",0);
-            List<DeliverGoodsDetailsVo> list = baseMapper.listDeliverGoodsDetails(wrapper);
+            List<DeliverGoodsDetailsVo> list = baseMapper.listDeliverGoodsDetails(wrapper1);
             BigDecimal count = list.stream()
                     .map(DeliverGoodsDetails::getDeliverGoodsQuantity)
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -105,8 +105,8 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(DeliverGoodsDto deliverGoodsDto) {
+        deliverGoodsDto.setStatus(0);//设置未到货
         this.save(deliverGoodsDto);
-        deliverGoodsDto.setStatus(0);
         List<DeliverGoodsDetails> deliverGoodsDetailsList = deliverGoodsDto.getDeliverGoodsDetailsList();
         for (DeliverGoodsDetails deliverGoodsDetails : deliverGoodsDetailsList) {
             deliverGoodsDetails.setDeliverGoodsId(deliverGoodsDto.getId());

hx-victoriatourist/src/main/resources/mapper/deliver/DeliverGoodsMapper.xml

@@ -22,6 +22,7 @@
         FROM
             deliver_goods dg
                 JOIN deliver_goods_details dgd ON dgd.deliver_goods_id = dg.id
+            ${ew.customSqlSegment}
     </select>
 
 </mapper>