1

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

@@ -291,6 +291,16 @@ public class TranProcessInfo extends BaseModel<TranProcessInfo> {
      */
     @TableField(exist = false)
     private String priceType;
+    /**
+     * 任务类型
+     */
+    @TableField(exist = false)
+    private String taskType;
+    /**
+     * 关联合同
+     */
+    @TableField(exist = false)
+    private String relatedContract;
 
     @Override
     protected Serializable pkVal() {

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

@@ -160,7 +160,18 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
             if (contractManagementInfo.getPriceType()!=null) {
                 tranProcessInfo.setPriceType(contractManagementInfo.getPriceType());
             }
-
+        }
+        if (tranTaskInfo.getTaskType()!=null) {
+            tranProcessInfo.setTaskType(tranTaskInfo.getTaskType());
+            if ("移库".equals(tranTaskInfo.getTaskType())) {
+                ContractManagementInfo contractManagementInfo1 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                        .eq("contract_no", tranTaskInfo.getSendWarehouse())
+                        .eq("comp_id", tranTaskInfo.getCompId()));
+                if (contractManagementInfo1 != null) {
+                    //关联合同
+                    tranProcessInfo.setRelatedContract(contractManagementInfo1.getContractNo());
+                }
+            }
         }
         //查看车次信息
         List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()