问题处理

hx-purchase/src/main/java/com/fjhx/purchase/controller/arrival/ArrivalController.java

@@ -57,7 +57,7 @@ public class ArrivalController {
      * 到货新增 维多利亚
      */
     @PostMapping("/addByWdly")
-    public void addByWdly(@RequestBody Arrival arrival) {
+    public void addByWdly(@RequestBody ArrivalDto arrival) {
         arrivalService.addByWdly(arrival);
     }
 

hx-purchase/src/main/java/com/fjhx/purchase/entity/arrival/dto/ArrivalDto.java

@@ -7,11 +7,15 @@ import lombok.Setter;
 /**
  * 到货新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-07
  */
 @Getter
 @Setter
 public class ArrivalDto extends Arrival {
 
+    /**
+     * 发货id
+     */
+    private Long deliverGoodsId;
 }

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

@@ -36,7 +36,7 @@ public interface ArrivalService extends BaseService<Arrival> {
     /**
      * 到货新增 维多利亚
      */
-    void addByWdly(Arrival arrival);
+    void addByWdly(ArrivalDto arrival);
 
     /**
      * 到货编辑

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

@@ -175,7 +175,20 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
      */
     @DSTransactional
     @Override
-    public void addByWdly(Arrival arrival) {
+    public void addByWdly(ArrivalDto arrival) {
+        //获取维多利亚json中的发货id
+        String victoriatouristJson = arrival.getVictoriatouristJson();
+        JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();
+        if(ObjectUtil.isEmpty(arrival.getDeliverGoodsId())){
+            arrival.setDeliverGoodsId(json.getLong("deliverGoodsId"));
+        }
+        //根据发货id查采购信息
+        if(ObjectUtil.isNotEmpty(arrival.getDeliverGoodsId())){
+            DeliverGoodsPo deliverGoodsInfo = wdlyService.getDeliverGoodsInfo(arrival.getDeliverGoodsId());
+            Assert.notEmpty(deliverGoodsInfo,"查询不到发货信息");
+            arrival.setPurchaseId(deliverGoodsInfo.getPurchaseId());
+        }
+
         if(ObjectUtil.isEmpty(arrival.getPurchaseId())){
             throw new ServiceException("采购id不能为空");
         }
@@ -194,8 +207,8 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
 //        purchaseService.updateById(purchase);
 
         //创建待入库记录
-        String victoriatouristJson = arrival.getVictoriatouristJson();
-        JSONObject json = JSONObject.parseObject(victoriatouristJson);
+//        String victoriatouristJson = arrival.getVictoriatouristJson();
+//        JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();
         Long deliverGoodsId = json.getLong("deliverGoodsId");
 
         if (ObjectUtil.isEmpty(deliverGoodsId)) {

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

@@ -4,6 +4,8 @@ import com.fjhx.victoriatourist.entity.deliver.po.DeliverGoods;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 发货列表查询返回值实体
  *
@@ -14,4 +16,9 @@ import lombok.Setter;
 @Setter
 public class DeliverGoodsVo extends DeliverGoods {
 
+    /**
+     * 发货明细列表
+     */
+    List<DeliverGoodsDetailsVo> deliverGoodsDetailsList;
+
 }

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

@@ -110,6 +110,9 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
 
     @Override
     public List<DeliverGoodsDetailsVo> detail(Long id) {
+//        DeliverGoods deliverGoods = this.getById(id);
+//        DeliverGoodsVo deliverGoodsVo = BeanUtil.copyProperties(deliverGoods, DeliverGoodsVo.class);
+
         //根据发货id查发货明细
         IWrapper<DeliverGoods> wrapper = IWrapper.getWrapper();
         wrapper.eq("dgd.deliver_goods_id", id);
@@ -156,6 +159,8 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
             BigDecimal subtract = count.subtract(deliverGoodsDetailsVo.getDeliverGoodsQuantity());
             deliverGoodsDetailsVo.setTransitQuantity(subtract);
         }
+
+//        deliverGoodsVo.setDeliverGoodsDetailsList(deliverGoodsDetailsVos);
         return deliverGoodsDetailsVos;
     }