修改

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

@@ -163,7 +163,16 @@ public class WarehouseBaseInfo extends BaseModel<WarehouseBaseInfo> {
     private Integer count;
     @TableField(exist = false)
     private List<PurchasePrice> purchasePriceList;
-
+    /**
+     * 品级
+     */
+    @TableField(exist = false)
+    private String grade;
+    /**
+     * 货名
+     */
+    @TableField(exist = false)
+    private String goodsName;
 
     @Override
     protected Serializable pkVal() {

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

@@ -119,13 +119,13 @@ public class DriverViewInfoServiceImpl extends ServiceImpl<DriverViewInfoMapper,
                 driverPayeeInfo.setId(IdGenerator.generateUUID());
                 driverPayeeInfo.setDriverId(driverViewInfo.getId());
                 //判断收款人身份证号是否唯一
-                List<DriverPayeeInfo> driverPayeeInfos =
-                        driverPayeeInfoService.selectList(new EntityWrapper<DriverPayeeInfo>()
-                                .eq(DriverPayeeInfo.QueryFiles.PAYEE_NUMBER_CARD, driverPayeeInfo.getPayeeNumberCard())
-                                .eq(DriverPayeeInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
-                if (driverPayeeInfos.size() > 0) {
-                    throw new YException(YExceptionEnum.PAYEE_NUMBER_ERROR);
-                }
+//                List<DriverPayeeInfo> driverPayeeInfos =
+//                        driverPayeeInfoService.selectList(new EntityWrapper<DriverPayeeInfo>()
+//                                .eq(DriverPayeeInfo.QueryFiles.PAYEE_NUMBER_CARD, driverPayeeInfo.getPayeeNumberCard())
+//                                .eq(DriverPayeeInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+//                if (driverPayeeInfos.size() > 0) {
+//                    throw new YException(YExceptionEnum.PAYEE_NUMBER_ERROR);
+//                }
             }
         }
         boolean one = this.insert(driverViewInfo);

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

@@ -47,6 +47,8 @@ public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, Tra
     @Autowired
     private IContractManagementInfoService contractManagementInfoService;
     @Autowired
+    private IContractGoodsInfoService contractGoodsInfoService;
+    @Autowired
     private IInOutWarehouseTaskService iInOutWarehouseTaskService;
     @Autowired
     private IWarehousePositionInfoService warehousePositionInfoService;
@@ -273,6 +275,18 @@ public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, Tra
                 .orderBy(WarehouseBaseInfo.QueryFiles.UPDATE_DATE, false));
         if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
             for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
+                //临时库带出品级
+                if ("2".equals(warehouseBaseInfo.getWarehouseType())){
+                    ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                    .eq("comp_id",compId)
+                    .eq("contract_no",warehouseBaseInfo.getWarehouseName()));
+                    if (contractManagementInfo!=null){
+                        //货物信息
+                        ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>().eq(ContractGoodsInfo.QueryFiles.CONTRACT_ID, contractManagementInfo.getId()));
+                        warehouseBaseInfo.setGrade(contractGoodsInfo.getGrade());
+                        warehouseBaseInfo.setGoodsName(contractGoodsInfo.getGoodsName());
+                    }
+                }
                 // 以库位为维度查询
                 List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
                         .eq("base_id", warehouseBaseInfo.getId()));