zhangyuewww 3 years ago
parent
commit
2124c5b416

+ 9 - 3
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -129,6 +129,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             warehouseBaseInfo.setWarehouseCity(contractManagementInfo.getSourceCity());
             warehouseBaseInfo.setWarehouseArea(contractManagementInfo.getSourceArea());
             warehouseBaseInfo.setDetailedAddress(contractManagementInfo.getSourceGoods());
+            warehouseBaseInfoService.addTemporaryWarehouse(warehouseBaseInfo);
             //临时仓库流转页面
             WarehouseInOutInfo warehouseInOutInfo = new WarehouseInOutInfo();
             warehouseInOutInfo.setId(IdGenerator.generateUUID());
@@ -137,14 +138,19 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             warehouseInOutInfo.setWarehouseName(contractManagementInfo.getContractNo());
             warehouseInOutInfo.setStatusFlag("3");
             warehouseInOutInfo.setInOutFlag(NumberConstant.CONSTANT2);
+            warehouseInOutInfo.setContractNo(contractManagementInfo.getContractNo());
             warehouseInOutInfo.setNetWeight(contractManagementInfo.getFinalTradingVolume());
-            warehouseInOutInfo.setGoodsName(contractManagementInfo.getGoodsName());
-            warehouseInOutInfo.setGoodsNameKey(contractManagementInfo.getGoodsNameKey());
+            warehouseInOutInfo.setGoodsName(contractManagementInfo.getContractGoodsInfo().getGoodsName());
+            warehouseInOutInfo.setGoodsNameKey(contractManagementInfo.getContractGoodsInfo().getGoodsNameKey());
+            warehouseInOutInfo.setGrade(contractManagementInfo.getContractGoodsInfo().getGrade());
+            warehouseInOutInfo.setGradeKey(contractManagementInfo.getContractGoodsInfo().getGradeKey());
             warehouseInOutInfo.setInOutType(NumberConstant.PURCHASE_WAREHOUSING);
+            warehouseInOutInfo.setInOutTypeKey(NumberConstant.CONSTANT1);
             warehouseInOutInfo.setBackOfficeId(AuthSecurityUtils.getCurrentUserId());
+            warehouseInOutInfo.setAgentKey(AuthSecurityUtils.getCurrentUserId());
+            warehouseInOutInfo.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
             warehouseInOutInfo.setBackOffice(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
             warehouseInOutInfo.setInOutDate(contractManagementInfo.getSigningDate());
-            warehouseBaseInfoService.addTemporaryWarehouse(warehouseBaseInfo);
             warehouseInOutInfoService.insert(warehouseInOutInfo);
         }
         // 货物信息新增