修改

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

@@ -332,7 +332,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
             }
             userDO.setPhone(commonUser.getPhone());
             userDO.setCid(commonUser.getCid());
-            userDO.setPassword(Md5Crypt.md5Crypt(password.getBytes(), "$1$" + commonUser.getPhone().substring(0, 7)));
+            userDO.setPassword(Md5Crypt.md5Crypt("123456".getBytes(), "$1$" + commonUser.getPhone().substring(0, 7)));
             this.insert(userDO);
         } else {
             userDO = targetUserList.get(0);

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

@@ -2,11 +2,13 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask;
 import com.yh.saas.plugin.yiliangyiyun.mapper.ContractGoodsInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IContractGoodsInfoService;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractGoodsInfo;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.IInOutWarehouseTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,6 +25,8 @@ public class ContractGoodsInfoServiceImpl extends ServiceImpl<ContractGoodsInfoM
 
     @Autowired
     private IContractManagementInfoService contractManagementInfoService;
+    @Autowired
+    private IInOutWarehouseTaskService inOutWarehouseTaskService;
     /**
      * 查看货物信息
      * @param contractId
@@ -34,8 +38,22 @@ public class ContractGoodsInfoServiceImpl extends ServiceImpl<ContractGoodsInfoM
         ContractGoodsInfo contractGoodsInfo = this.selectOne(new EntityWrapper<ContractGoodsInfo>().eq(ContractGoodsInfo.QueryFiles.CONTRACT_ID, contractId));
         //合同信息
         ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>().eq(ContractManagementInfo.QueryFiles.CONTRACT_NO, contractNo));
-        contractGoodsInfo.setWeight(contractManagementInfo.getWeight());
-        contractGoodsInfo.setUnitContractPrice(contractManagementInfo.getUnitContractPrice());
+        if(contractManagementInfo!=null) {
+            contractGoodsInfo.setWeight(contractManagementInfo.getWeight());
+            contractGoodsInfo.setUnitContractPrice(contractManagementInfo.getUnitContractPrice());
+        }
+        //移库编号信息
+        InOutWarehouseTask inOutWarehouseTask = inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>().eq("move_task_no", contractNo));
+        if(inOutWarehouseTask!=null) {
+            ContractGoodsInfo contractGoodsInfo1=new ContractGoodsInfo();
+            contractGoodsInfo1.setWeight(inOutWarehouseTask.getWeight());
+            contractGoodsInfo1.setUnitContractPrice(Double.valueOf(String.valueOf(inOutWarehouseTask.getUnitPrice())));
+            contractGoodsInfo1.setGoodsName(inOutWarehouseTask.getGoodsName());
+            contractGoodsInfo1.setBulkDensity(inOutWarehouseTask.getBulkDensity());
+            contractGoodsInfo1.setWaterContent(inOutWarehouseTask.getWaterContent());
+            contractGoodsInfo1.setGrade(inOutWarehouseTask.getGrade());
+            contractGoodsInfo=contractGoodsInfo1;
+        }
         return contractGoodsInfo;
     }
 }