1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/InOutWarehouseTask.java

@@ -259,6 +259,11 @@ public class InOutWarehouseTask extends BaseModel<InOutWarehouseTask> {
      */
     @TableField(exist = false)
     private List<InOutWarehouseTask> inOutWarehouseTaskList;
+    /**
+     * 货源任务关联集合
+     */
+    @TableField(exist = false)
+    private List<SourceRelationInfo> sourceRelationInfoList;
     /**
      * 仓库名集合
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SourceRelationInfo.java

@@ -3,6 +3,7 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 import java.util.Date;
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
@@ -52,6 +53,10 @@ public class SourceRelationInfo extends BaseModel<SourceRelationInfo> {
      * 预计出库重量（吨）
      */
     private Float estimateOutWarehouseWeight;
+    /**
+     * 实际出库重量（吨）
+     */
+    private Float actualOutWarehouseWeight;
     /**
      * 货名key
      */
@@ -64,10 +69,27 @@ public class SourceRelationInfo extends BaseModel<SourceRelationInfo> {
      * 剩余重量（吨）
      */
     private Float surplusWeight;
+    /**
+     * 比例
+     */
+    private Double proportion;
     /**
      * 出单时间
      */
     private Date issuingTime;
+    /**
+     * 车牌号
+     */
+    private String carNo;
+    /**
+     * 出货库
+     */
+    private String warehouseName;
+    /**
+     * 出入库id
+     */
+    @TableField(exist = false)
+    private String warehouseInOutId;
 
 
     @Override

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseInOutInfo.java

@@ -240,6 +240,10 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
      * 合同编号
      */
     private String contractNo;
+    /**
+     * 退库勾选标识（0未勾选1已勾选）
+     */
+    private String returnTickFlag;
     /**
      * 附件地址
      */

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

@@ -72,6 +72,8 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
     private ICommonRoleResourceService roleResourceService;
     @Autowired
     private IWarehousingOrderService warehousingOrderService;
+    @Autowired
+    private ISourceRelationInfoService sourceRelationInfoService;
 
     /**
      * 出入库任务新增 编辑
@@ -90,6 +92,17 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
             inOutWarehouseTask.setTaskStatusKey(StatusEnum.TASK_REVIEWED.getFlag());
             inOutWarehouseTask.setTaskStatus(StatusEnum.TASK_REVIEWED.getName());
             inOutWarehouseTask.setEstablishDate(new Date());
+            List<SourceRelationInfo> sourceRelationInfoList = inOutWarehouseTask.getSourceRelationInfoList();
+            if (CollectionUtils.isNotEmpty(sourceRelationInfoList)) {
+                for (SourceRelationInfo sourceRelationInfo: sourceRelationInfoList) {
+                    sourceRelationInfo.setId(IdGenerator.generateUUID());
+                    sourceRelationInfo.setTaskId(inOutWarehouseTask.getId());
+                    sourceRelationInfoService.insert(sourceRelationInfo);
+                    WarehousingOrder warehousingOrder=warehousingOrderService.selectById(sourceRelationInfo.getSourceId());
+                    warehousingOrder.setSurplusWeight(warehousingOrder.getSurplusWeight()-sourceRelationInfo.getEstimateOutWarehouseWeight());
+                    warehousingOrderService.updateById(warehousingOrder);
+                }
+            }
             //出库任务，入库任务，赋值关联id
             if ("1".equals(inOutWarehouseTask.getTaskTypeKey()) || "2".equals(inOutWarehouseTask.getTaskTypeKey())) {
                 inOutWarehouseTask.setRelevanceId(inOutWarehouseTask.getId());

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

@@ -208,6 +208,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                 warehousingOrder.setCarNo(paymentManagement.getCarNo());
                 warehousingOrder.setGoodsName(paymentManagement.getGoodsName());
                 warehousingOrder.setInWarehouseWeight(paymentManagement.getNetWeight());
+                warehousingOrder.setSurplusWeight(paymentManagement.getNetWeight());
                 warehousingOrder.setAmountNotPayable(paymentManagement.getAmountIngPayable());
                 warehousingOrder.setAmountEdPayable(0d);
                 warehousingOrder.setIssuingTime(new Date());
@@ -267,6 +268,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                 warehousingOrder.setInWarehouseWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                 warehousingOrder.setAmountNotPayable(warehouseInOutInfo.getCost()*warehouseInOutInfo.getNetWeight());
                 warehousingOrder.setAmountEdPayable(0d);
+                warehousingOrder.setSurplusWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                 warehousingOrder.setIssuingTime(new Date());
                 warehousingOrder.setGrainFund(warehouseInOutInfo.getCost()*warehouseInOutInfo.getNetWeight());
 //                boolean isStartWorkflow = StringUtils.isBlank(warehousingOrder.getWorkflowId());
@@ -308,6 +310,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                 warehousingOrder.setBaseId(warehouseInOutInfo.getBaseId());
                 InOutWarehouseTask inOutWarehouseTask = inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
                         .eq("in_out_task_no", warehouseInOutInfo.getInOutTaskNo()));
+                warehousingOrder.setMoveTaskNo(inOutWarehouseTask.getMoveTaskNo());
                 warehousingOrder.setWarehouseInOutId(warehouseInOutInfo.getId());
                 warehousingOrder.setWarehouseName(warehouseInOutInfo.getWarehouseName());
                 //货源为发货库
@@ -320,6 +323,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                 warehousingOrder.setGoodsName(warehouseInOutInfo.getGoodsName());
                 warehousingOrder.setContractNo(warehouseInOutInfo.getContractNo());
                 warehousingOrder.setInWarehouseWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                warehousingOrder.setSurplusWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
 //                boolean isStartWorkflow = StringUtils.isBlank(warehousingOrder.getWorkflowId());
 //                // 不是退回的单子
 //                if (isStartWorkflow) {
@@ -371,6 +375,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                 warehousingOrder.setGoodsName(warehouseInOutInfo.getGoodsName());
                 warehousingOrder.setContractNo(warehouseInOutInfo.getContractNo());
                 warehousingOrder.setInWarehouseWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                warehousingOrder.setSurplusWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                 this.insert(warehousingOrder);
             }
         }