退货单详情页优化

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ReturnCargoOrderMapper.xml

@@ -378,7 +378,8 @@
             c.name as secondSupplyName,
             d.name as thirdSupplyName,
             e.name as businessLineName,
-            f.name as supplyName
+            f.name as supplyName,
+            g.name as secondCustomName
         FROM
             jg_return_cargo_order a
                 LEFT JOIN jg_business_order b ON a.business_id = b.id
@@ -390,6 +391,7 @@
                 LEFT JOIN jg_business_line e ON b.business_line_id = e.id
                 AND e.f_delete_mark IS NULL
                 LEFT JOIN jg_subject_basic f ON b.first_subject_basic_id = f.id AND f.f_delete_mark IS NULL
+                LEFT JOIN jg_subject_basic g ON b.second_subject_basic_id = g.id AND g.f_delete_mark IS NULL
             ${ew.customSqlSegment}
     </select>
 </mapper>

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/DeliveryOrderController.java

@@ -94,6 +94,8 @@ public class    DeliveryOrderController {
     private BusinessOrderService businessOrderService;
     @Autowired
     private BusinessCargoService businessCargoService;
+    @Autowired
+    private ReturnCargoOrderService returnCargoOrderService;
 
     /**
     * 列表
@@ -580,6 +582,12 @@ public class    DeliveryOrderController {
         if (entity.getDeliveryType().equals("2")){ //销售发货单详情
             List<BusinessOrderInfoModel> businessOrderInfoModelList = deliveryOrderService.queryDeliveryOrderInfo(entity.getBusinessId());
             deliveryOrderMap.put("businessOrderInfoList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessOrderInfoModelList)));
+        }else if(entity.getDeliveryType().equals("1")){
+            QueryWrapper<ReturnCargoOrderEntity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("a.id",entity.getBusinessId());
+            queryWrapper.isNull("a.f_delete_mark");
+            List<ReturnCargoOrderEntity> list= returnCargoOrderService.queryReturnOrderByDeliveryInfo(queryWrapper);
+            deliveryOrderMap.put("purchaseReturnCargoOrderInfo",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(list)));
         }
         deliveryOrderMap = generaterSwapUtil.swapDataForm(deliveryOrderMap,DeliveryOrderConstant.getFormData(),DeliveryOrderConstant.TABLEFIELDKEY,DeliveryOrderConstant.TABLERENAMES);
         return ActionResult.success(deliveryOrderMap);

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ReceiptOrderController.java

@@ -598,6 +598,7 @@ public class ReceiptOrderController {
         }else if (entity.getReceiptType().equals("2")){
             QueryWrapper<ReturnCargoOrderEntity> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("a.id",entity.getBusinessId());
+            queryWrapper.isNull("a.f_delete_mark");
             List<ReturnCargoOrderEntity> list= returnCargoOrderService.queryReturnOrderByDeliveryInfo(queryWrapper);
             entity.setSaleReturnCargoOrderInfo(list);
         }

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ReturnCargoOrderController.java

@@ -575,6 +575,19 @@ public class ReturnCargoOrderController {
         returnCargoOrderMap.put("id", returnCargoOrderMap.get("id"));
         //副表数据
         //子表数据
+        if (entity.getDocumentType().equals("1")) {
+            QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("a.id",entity.getBusinessId());
+            queryWrapper.isNull("a.f_delete_mark");
+            List<BusinessOrderEntity> businessOrderEntityList = businessOrderService.purchaseOrderByReceiptOrderInfo(queryWrapper);
+            returnCargoOrderMap.put("purchaseOrderInfo",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessOrderEntityList)));
+        }else if (entity.getDocumentType().equals("2")){
+            QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("a.id",entity.getBusinessId());
+            queryWrapper.isNull("a.f_delete_mark");
+            List<BusinessOrderEntity> businessOrderEntityList = businessOrderService.saleOrderByDeliveryOrderInfo(queryWrapper);
+            returnCargoOrderMap.put("saleOrderInfo",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessOrderEntityList)));
+        }
         List<DeliveryVoucherRelationEntity> deliveryVoucherRelationList = returnCargoOrderService.getDeliveryVoucherRelationList(entity.getId());
         returnCargoOrderMap.put("deliveryVoucherRelationList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(deliveryVoucherRelationList)));
         List<DeliveryProductRelationEntity> deliveryProductRelationList = returnCargoOrderService.getDeliveryProductRelationList(entity.getId());