发货登记添加历史登记记录

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/deliver/dto/DeliverGoodsSelectDto.java

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 public class DeliverGoodsSelectDto extends BaseSelectDto {
 
+    /**
+     * 采购单号
+     */
+    private Long purchaseId;
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/deliver/po/DeliverGoods.java

@@ -43,4 +43,9 @@ public class DeliverGoods extends BasePo {
      */
     private String phone;
 
+    /**
+     * 副物流单号
+     */
+    private String subCode;
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/deliver/po/DeliverGoodsDetails.java

@@ -34,4 +34,9 @@ public class DeliverGoodsDetails extends BasePo {
      */
     private BigDecimal deliverGoodsQuantity;
 
+    /**
+     * 产品id
+     */
+    private Long productId;
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/deliver/vo/DeliverGoodsDetailsVo.java

@@ -66,4 +66,36 @@ public class DeliverGoodsDetailsVo extends DeliverGoodsDetails {
      */
     private Long purchaseId;
 
+
+    /**
+     * 货品类型
+     */
+    private String productType;
+
+
+    /**
+     * 货品编码
+     */
+    private String productCode;
+
+    /**
+     * 货品名称
+     */
+    private String productName;
+
+    /**
+     * 单位
+     */
+    private String productUnit;
+
+    /**
+     * 货品规格型号
+     */
+    private String productSpec;
+
+    /**
+     * 货品编码
+     */
+    private String productCustomCode;
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/deliver/vo/DeliverGoodsVo.java

@@ -21,4 +21,6 @@ public class DeliverGoodsVo extends DeliverGoods {
      */
     List<DeliverGoodsDetailsVo> deliverGoodsDetailsList;
 
+    private String logisticsCompanyName;
+
 }

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

@@ -63,4 +63,9 @@ public class LogisticsDetails extends BasePo {
      */
     private Long stockWaitDetailsId;
 
+    /**
+     * 发货明细id
+     */
+    private Long deliverGoodsDetailsId;
+
 }

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

@@ -112,4 +112,14 @@ public class LogisticsInfos extends BasePo {
      * 收/发件人手机号
      */
     private String phone;
+
+    /**
+     * 发货id
+     */
+    private Long deliverGoodsId;
+
+    /**
+     * 副物流单号
+     */
+    private String subCode;
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/mapper/deliver/DeliverGoodsDetailsMapper.java

@@ -1,12 +1,14 @@
 package com.fjhx.victoriatourist.mapper.deliver;
 
-import com.fjhx.victoriatourist.entity.deliver.po.DeliverGoodsDetails;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.deliver.po.DeliverGoodsDetails;
 import com.fjhx.victoriatourist.entity.deliver.vo.DeliverGoodsDetailsVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -22,5 +24,7 @@ public interface DeliverGoodsDetailsMapper extends BaseMapper<DeliverGoodsDetail
      * 发货明细分页
      */
     Page<DeliverGoodsDetailsVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<DeliverGoodsDetails> wrapper);
+    List<DeliverGoodsDetailsVo> getList( @Param("ew") IWrapper<DeliverGoodsDetails> wrapper);
+
 
 }

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

@@ -1,12 +1,13 @@
 package com.fjhx.victoriatourist.service.deliver;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
+import com.fjhx.victoriatourist.entity.deliver.dto.DeliverGoodsDetailsDto;
+import com.fjhx.victoriatourist.entity.deliver.dto.DeliverGoodsDetailsSelectDto;
 import com.fjhx.victoriatourist.entity.deliver.po.DeliverGoodsDetails;
-import com.ruoyi.common.core.service.BaseService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.victoriatourist.entity.deliver.vo.DeliverGoodsDetailsVo;
-import com.fjhx.victoriatourist.entity.deliver.dto.DeliverGoodsDetailsSelectDto;
-import com.fjhx.victoriatourist.entity.deliver.dto.DeliverGoodsDetailsDto;
+import com.ruoyi.common.core.service.BaseService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
 
 import java.util.List;
 
@@ -26,6 +27,8 @@ public interface DeliverGoodsDetailsService extends BaseService<DeliverGoodsDeta
      */
     Page<DeliverGoodsDetailsVo> getPage(DeliverGoodsDetailsSelectDto dto);
 
+    List<DeliverGoodsDetailsVo> getList(IWrapper<DeliverGoodsDetails> wrapper);
+
     /**
      * 发货明细明细
      */

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

@@ -10,7 +10,6 @@ import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
-import com.fjhx.supply.entity.supplier.po.SupplierPrice;
 import com.fjhx.victoriatourist.entity.deliver.dto.DeliverGoodsDetailsDto;
 import com.fjhx.victoriatourist.entity.deliver.dto.DeliverGoodsDetailsSelectDto;
 import com.fjhx.victoriatourist.entity.deliver.po.DeliverGoodsDetails;
@@ -54,6 +53,21 @@ public class DeliverGoodsDetailsServiceImpl extends ServiceImpl<DeliverGoodsDeta
     }
 
     @Override
+    public List<DeliverGoodsDetailsVo> getList(IWrapper<DeliverGoodsDetails> wrapper) {
+        List<DeliverGoodsDetailsVo> list = baseMapper.getList(wrapper);
+        //赋值产品信息
+        productInfoService.attributeAssign(list, DeliverGoodsDetails::getProductId, (item, productinfo) -> {
+            item.setProductType(productinfo.getType());
+            item.setProductCode(productinfo.getCode());
+            item.setProductCustomCode(productinfo.getCustomCode());
+            item.setProductName(productinfo.getName());
+            item.setProductSpec(productinfo.getSpec());
+            item.setProductUnit(productinfo.getUnit());
+        });
+        return list;
+    }
+
+    @Override
     public List<PurchaseDetailVo> detail(Long id) {
         PurchaseVo detail = purchaseService.detail(id);
         List<PurchaseDetail> purchaseDetailList1 = detail.getPurchaseDetailList();
@@ -62,11 +76,11 @@ public class DeliverGoodsDetailsServiceImpl extends ServiceImpl<DeliverGoodsDeta
         List<Long> pdids = purchaseDetailVoList.stream().map(PurchaseDetail::getId).collect(Collectors.toList());
         List<DeliverGoodsDetails> list = list(q -> q.in(DeliverGoodsDetails::getPurchaseDetailId, pdids));
         Map<Long, List<DeliverGoodsDetails>> collect = list.stream().collect(Collectors.groupingBy(DeliverGoodsDetails::getPurchaseDetailId));
-        for (PurchaseDetailVo purchaseDetail:purchaseDetailVoList){
+        for (PurchaseDetailVo purchaseDetail : purchaseDetailVoList) {
             //赋值已发货数量
             purchaseDetail.setDeliverGoodsQuantity(BigDecimal.ZERO);
             List<DeliverGoodsDetails> deliverGoodsDetailsList1 = collect.get(purchaseDetail.getId());
-            if (ObjectUtil.isEmpty(deliverGoodsDetailsList1)){
+            if (ObjectUtil.isEmpty(deliverGoodsDetailsList1)) {
                 continue;
             }
             BigDecimal count = deliverGoodsDetailsList1.stream()

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

@@ -14,6 +14,8 @@ import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.kd100.entity.company.po.CompanyInfo;
+import com.fjhx.kd100.service.company.CompanyInfoService;
 import com.fjhx.kd100.util.KD100Util;
 import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
 import com.fjhx.purchase.entity.arrival.vo.ArrivalDetailVo;
@@ -119,6 +121,8 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
     private QualityDetailsService qualityDetailsService;
     @Autowired
     private PurchaseDetailMapper purchaseDetailMapper;
+    @Autowired
+    private CompanyInfoService companyInfoService;
 
     @Value("${spring.profiles.active}")
     private String active;
@@ -127,11 +131,39 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
     @Override
     public Page<DeliverGoodsVo> getPage(DeliverGoodsSelectDto dto) {
         IWrapper<DeliverGoods> wrapper = getWrapper();
+
+        wrapper.eq("dg", DeliverGoods::getPurchaseId, dto.getPurchaseId());
+
         wrapper.orderByDesc("dg", DeliverGoods::getId);
         Page<DeliverGoodsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<DeliverGoodsVo> records = page.getRecords();
+        if (ObjectUtil.isEmpty(records)) {
+            return page;
+        }
+        setInfo(records);
         return page;
     }
 
+    void setInfo(List<DeliverGoodsVo> lsit) {
+        if (ObjectUtil.isEmpty(lsit)) {
+            return;
+        }
+
+        //赋值物流公司名称
+        List<String> companyCode = lsit.stream().map(DeliverGoodsVo::getLogisticsCompanyCode).collect(Collectors.toList());
+        List<CompanyInfo> companyInfoList = companyInfoService.list(q -> q.in(CompanyInfo::getCode, companyCode));
+        Map<String, String> companyInfoMap = companyInfoList.stream().collect(Collectors.toMap(CompanyInfo::getCode, CompanyInfo::getName));
+
+        List<Long> ids = lsit.stream().map(DeliverGoods::getId).collect(Collectors.toList());
+        List<DeliverGoodsDetailsVo> list = deliverGoodsDetailsService.getList(IWrapper.<DeliverGoodsDetails>getWrapper().in(DeliverGoodsDetails::getDeliverGoodsId, ids));
+        Map<Long, List<DeliverGoodsDetailsVo>> collect = list.stream().collect(Collectors.groupingBy(DeliverGoodsDetails::getDeliverGoodsId));
+        for (DeliverGoodsVo deliverGoods : lsit) {
+            deliverGoods.setDeliverGoodsDetailsList(collect.getOrDefault(deliverGoods.getId(), new ArrayList<>()));
+
+            deliverGoods.setLogisticsCompanyName(companyInfoMap.get(deliverGoods.getLogisticsCompanyCode()));
+        }
+    }
+
     @Override
     public List<DeliverGoodsDetailsVo> detail(Long id) {
         Assert.notEmpty(id, "发货id不能为空");
@@ -218,10 +250,11 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
         DynamicDataSourceContextHolder.push(SourceConstant.KD100);
         //只在生产环境调用Kd100
         String activeProfile = SpringUtil.getActiveProfile();
-        Integer state = !"prod".equals(activeProfile) ? -1 : KD100Util.monitor(logisticsInfos.getLogisticsCompanyCode(), logisticsInfos.getCode(),logisticsInfos.getPhone(), logisticsInfos.getId(), 1, LogisticsInfos.class).getState();
+        Integer state = !"prod".equals(activeProfile) ? -1 : KD100Util.monitor(logisticsInfos.getLogisticsCompanyCode(), logisticsInfos.getCode(), logisticsInfos.getPhone(), logisticsInfos.getId(), 1, LogisticsInfos.class).getState();
         DynamicDataSourceContextHolder.poll();
         logisticsInfos.setIsKd100(1);
         logisticsInfos.setLogisticsStatus(state);
+        logisticsInfos.setDeliverGoodsId(deliverGoodsDto.getId());
 
         logisticsInfosService.save(logisticsInfos);
 
@@ -229,6 +262,11 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
         List<LogisticsDetails> logisticsDetailsList = new ArrayList<>();
 
         for (DeliverGoodsDetails deliverGoodsDetails : deliverGoodsDetailsList) {
+            deliverGoodsDetails.setId(IdWorker.getId());
+
+            PurchaseDetail byId = purchaseDetailService.getById(deliverGoodsDetails.getPurchaseDetailId());
+            deliverGoodsDetails.setProductId(byId.getBussinessId());
+
             deliverGoodsDetails.setDeliverGoodsId(deliverGoodsDto.getId());
 
             LogisticsDetails logisticsDetails = new LogisticsDetails();
@@ -237,6 +275,7 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
             logisticsDetails.setPurchaseId(purchase.getId());
             logisticsDetails.setPurchaseDetailsId(deliverGoodsDetails.getPurchaseDetailId());
             logisticsDetails.setShipmentQuantity(deliverGoodsDetails.getDeliverGoodsQuantity());
+            logisticsDetails.setDeliverGoodsDetailsId(deliverGoodsDetails.getId());
             logisticsDetailsList.add(logisticsDetails);
         }
         deliverGoodsDetailsService.saveBatch(deliverGoodsDetailsList);
@@ -244,8 +283,27 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
     }
 
     @Override
+    @DSTransactional
     public void edit(DeliverGoodsDto deliverGoodsDto) {
         this.updateById(deliverGoodsDto);
+
+        LogisticsInfos logisticsInfos = logisticsInfosService.getOne(q -> q.eq(LogisticsInfos::getBusinessId, deliverGoodsDto.getId())
+                .or().eq(LogisticsInfos::getDeliverGoodsId, deliverGoodsDto.getId()));
+
+        //发起快递100订阅
+        DynamicDataSourceContextHolder.push(SourceConstant.KD100);
+        //只在生产环境调用Kd100
+        String activeProfile = SpringUtil.getActiveProfile();
+        Integer state = !"prod".equals(activeProfile) ? -1 : KD100Util.monitor(deliverGoodsDto.getLogisticsCompanyCode(), deliverGoodsDto.getCode(), deliverGoodsDto.getPhone(), logisticsInfos.getId(), 1, LogisticsInfos.class).getState();
+        DynamicDataSourceContextHolder.poll();
+
+        logisticsInfos.setLogisticsCompanyCode(deliverGoodsDto.getLogisticsCompanyCode());
+        logisticsInfos.setCode(deliverGoodsDto.getCode());
+        logisticsInfos.setSubCode(deliverGoodsDto.getSubCode());
+        logisticsInfos.setStatus(state);
+
+        logisticsInfosService.updateById(logisticsInfos);
+
     }
 
     @Override
@@ -256,7 +314,7 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
     @Override
     public List<DeliverGoodsVo> list(Long id) {
         //根据采购id查发货列表
-        List<DeliverGoodsVo> list = baseMapper.getList(IWrapper.getWrapper().eq("dg",DeliverGoods::getPurchaseId, id).eq("dg",DeliverGoods::getStatus, 0));
+        List<DeliverGoodsVo> list = baseMapper.getList(IWrapper.getWrapper().eq("dg", DeliverGoods::getPurchaseId, id).eq("dg", DeliverGoods::getStatus, 0));
         return list;
     }
 
@@ -497,7 +555,7 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
     }
 
     @Override
-    public List<DeliverGoodsDetailsVo> listDeliverGoodsDetails(IWrapper<DeliverGoods> wrapper){
+    public List<DeliverGoodsDetailsVo> listDeliverGoodsDetails(IWrapper<DeliverGoods> wrapper) {
         return baseMapper.listDeliverGoodsDetails(wrapper);
     }
 

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

@@ -13,5 +13,14 @@
         from deliver_goods_details dgd
             ${ew.customSqlSegment}
     </select>
+    <select id="getList" resultType="com.fjhx.victoriatourist.entity.deliver.vo.DeliverGoodsDetailsVo">
+        SELECT
+            dgd.*,
+            pd.bussiness_id as productId
+        FROM
+            deliver_goods_details dgd
+                LEFT JOIN bytesailing_purchase.purchase_detail pd ON dgd.purchase_detail_id = pd.id
+        ${ew.customSqlSegment}
+    </select>
 
 </mapper>

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

@@ -11,7 +11,8 @@
             dg.create_user,
             dg.create_time,
             dg.update_user,
-            dg.update_time
+            dg.update_time,
+            dg.sub_code
         from deliver_goods dg
             ${ew.customSqlSegment}
     </select>