1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/InOutWarehouseTaskController.java

@@ -162,6 +162,15 @@ public class InOutWarehouseTaskController {
     public InOutWarehouseTask getContractNo(String compId, String warehouseName) {
         return inOutWarehouseTaskService.getContractNo(compId,warehouseName);
     }
+    /**
+     *
+     * @param inOutWarehouseTask
+     * @return
+     */
+    @GetMapping("/tranTaskCount")
+    public Integer tranTaskCount(InOutWarehouseTask inOutWarehouseTask) {
+        return inOutWarehouseTaskService.tranTaskCount(inOutWarehouseTask);
+    }
 
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IInOutWarehouseTaskService.java

@@ -110,4 +110,11 @@ public interface IInOutWarehouseTaskService extends IService<InOutWarehouseTask>
      * @return
      */
     String correct(InOutWarehouseTask inOutWarehouseTask);
+
+    /**
+     * 判断该任务编号是否有运输任务
+     * @param inOutWarehouseTask
+     * @return
+     */
+    Integer tranTaskCount(InOutWarehouseTask inOutWarehouseTask);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/InOutWarehouseTaskServiceImpl.java

@@ -76,6 +76,8 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
     @Autowired
     private ISourceRelationInfoService sourceRelationInfoService;
     @Autowired
+    private ITranTaskInfoService tranTaskInfoService;
+    @Autowired
     private CacheComponent cacheComponent;
     /**
      * 出入库任务新增 编辑
@@ -687,4 +689,12 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
         return "ok";
     }
 
+    @Override
+    public Integer tranTaskCount(InOutWarehouseTask inOutWarehouseTask) {
+        Integer count=tranTaskInfoService.selectCount(new EntityWrapper<TranTaskInfo>()
+        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo())
+        .eq("comp_id",inOutWarehouseTask.getCompId()));
+        return count;
+    }
+
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

@@ -310,6 +310,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                     contractInventoryDistribution1.setId(IdGenerator.generateUUID());
                     contractInventoryDistribution1.setCompId(warehousingOrder1.getCompId());
                     contractInventoryDistribution1.setInventory(Double.valueOf(String.valueOf(warehousingOrder.getInWarehouseWeight())));
+                    contractInventoryDistribution1.setWarehouse(warehousingOrder1.getWarehouseName());
                     contractInventoryDistribution1.setLocusWarehouse(warehousingOrder1.getWarehouseName());
                     contractInventoryDistribution1.setGoodsName(warehousingOrder1.getGoodsName());
                     contractInventoryDistribution1.setInventoryType("3");
@@ -1054,7 +1055,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                 cell.setCellValue(editString(warehousingOrder1.getGoodsSource()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(2);
-                cell.setCellValue(editString(warehousingOrder1.getDeliveryWarehouse()));
+                cell.setCellValue(editString(warehousingOrder1.getWarehouseName()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(3);
                 cell.setCellValue(editString(warehousingOrder1.getGoodsName()));

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehousingOrderMapper.xml

@@ -55,6 +55,7 @@
         SELECT
         w.id,
         w.comp_id as compId,
+        w.goods_source as goodsSource,
         w.warehouse_name as warehouseName,
         wbi.warehouse_type as warehouseType,
         w.avg_cost as avgCost,
@@ -66,6 +67,12 @@
         w.request_person as requestPerson,
         w.request_date as requestDate,
         w.in_warehouse_weight as inWarehouseWeight,
+        w.out_warehouse_weight as outWarehouseWeight,
+        w.profit_and_loss as profitAndLoss,
+        w.surplus_weight as surplusWeight,
+        w.grain_fund as grainFund,
+        w.amount_ed_payable as amountEdPayable,
+        w.amount_money as amountMoney,
         w.customer,
         w.remark,
         w.batch_id as batchId,