修改

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

@@ -274,11 +274,11 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         weightedDetails.setGoodsNameKey(warehouseInOutInfo1.getGoodsNameKey());
         weightedDetails.setGoodsName(warehouseInOutInfo1.getGoodsName());
         weightedDetails.setGrainType(warehouseInOutInfo1.getType());
-        weightedDetails.setInTypeKey(warehouseInOutInfo1.getTaskTypeKey());
-        weightedDetails.setInType(warehouseInOutInfo1.getTaskType());
+        weightedDetails.setInTypeKey(warehouseInOutInfo1.getInOutTypeKey());
+        weightedDetails.setInType(warehouseInOutInfo1.getInOutType());
         weightedDetails.setNetWeight(warehouseInOutInfo1.getNetWeight());
         weightedDetails.setPureWeight(warehouseInOutInfo1.getPureWeight());
-        weightedDetails.setUnitPrice(warehouseInOutInfo1.getUnitPrice());
+        weightedDetails.setUnitPrice(warehouseInOutInfo1.getCost());
         weightedDetails.setDeductionAmount(warehouseInOutInfo1.getDeductionAmount());
         weightedDetails.setFreight(warehouseInOutInfo1.getFreight());
         weightedDetails.setOriginalStock(original);

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

@@ -417,8 +417,13 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
      */
     @Override
     public List<WarehouseBaseInfo> selectWarehouse(String compId, String warehouseType) {
-        List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(new EntityWrapper<WarehouseBaseInfo>()
-                .eq("comp_id", compId).eq("warehouse_type", warehouseType).eq("delete_flag", "0"));
+        Wrapper<WarehouseBaseInfo> warehouseBaseInfoWrapper = new EntityWrapper<>();
+        warehouseBaseInfoWrapper.eq("comp_id", compId)
+                                .eq("delete_flag", "0");
+        if (warehouseType!=null&&!warehouseType.isEmpty()){
+            warehouseBaseInfoWrapper.eq("warehouse_type", warehouseType);
+        }
+        List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(warehouseBaseInfoWrapper);
         if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
             for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
                 List<WarehousePositionStorageInfo> temp = new ArrayList();

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

@@ -720,11 +720,11 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     weightedDetails.setGoodsNameKey(warehouseInOutInfo.getGoodsNameKey());
                     weightedDetails.setGoodsName(warehouseInOutInfo.getGoodsName());
                     weightedDetails.setGrainType(warehouseInOutInfo.getType());
-                    weightedDetails.setInTypeKey(warehouseInOutInfo.getTaskTypeKey());
-                    weightedDetails.setInType(warehouseInOutInfo.getTaskType());
+                    weightedDetails.setInTypeKey(warehouseInOutInfo.getInOutTypeKey());
+                    weightedDetails.setInType(warehouseInOutInfo.getInOutType());
                     weightedDetails.setNetWeight(warehouseInOutInfo.getNetWeight());
                     weightedDetails.setPureWeight(warehouseInOutInfo.getPureWeight());
-                    weightedDetails.setUnitPrice(warehouseInOutInfo.getUnitPrice());
+                    weightedDetails.setUnitPrice(warehouseInOutInfo.getCost());
                     weightedDetails.setDeductionAmount(warehouseInOutInfo.getDeductionAmount());
                     weightedDetails.setFreight(warehouseInOutInfo.getFreight());
                     weightedDetails.setOriginalStock(original);