修改

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

@@ -59,6 +59,10 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
     private IWarehouseInOutInfoService warehouseInOutInfoService;
     @Autowired
     private IWarehouseInOutDetailService warehouseInOutDetailService;
+    @Autowired
+    private IWarehouseBaseInfoService warehouseBaseInfoService;
+    @Autowired
+    private IWarehousePositionInfoService warehousePositionInfoService;
 
     /**
      * 付款管理列表
@@ -184,11 +188,21 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             WarehouseInOutInfo warehouseInOutInfo1 = new WarehouseInOutInfo();
             warehouseInOutInfo1.setId(IdGenerator.generateUUID());
             warehouseInOutInfo1.setWarehouseName(paymentManagement1.getWarehouseName());
+            WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                    .eq("warehouse_name",paymentManagement1.getWarehouseName())
+                    .eq("comp_id",qualityInspectionManagement.getCompId()));
+            warehouseInOutInfo1.setBaseId(warehouseBaseInfo.getId());
+            //查到仓位编号
+            WarehousePositionInfo warehousePositionInfo = warehousePositionInfoService.selectOne(new EntityWrapper<WarehousePositionInfo>()
+                    .eq("base_id",warehouseBaseInfo.getId())
+                    .eq("bin_number",qualityInspectionManagement.getBinNumber()));
+            warehouseInOutInfo1.setPositionId(warehousePositionInfo.getId());
             warehouseInOutInfo1.setBinNumber(qualityInspectionManagement.getBinNumber());
             warehouseInOutInfo1.setGoodsName(paymentManagement1.getGoodsName());
             warehouseInOutInfo1.setGrossWeight(paymentManagement1.getGrossWeight());
             warehouseInOutInfo1.setTare(paymentManagement1.getTare());
             warehouseInOutInfo1.setInOutType("收购入库");
+            warehouseInOutInfo1.setInOutFlag("2");
             warehouseInOutInfo1.setCarNo(paymentManagement1.getCarNo());
             warehouseInOutInfo1.setContractNo(paymentManagement1.getPaymentNo());
             warehouseInOutInfo1.setAgent(paymentManagement.getSettlementClerk());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseInOutInfoMapper.xml

@@ -19,12 +19,14 @@
             </if>
         </if>
         <if test="pcFlag != null and pcFlag != ''and pcFlag == '1'">
-            AND w.base_id = #{baseId}
-            and w.position_id = #{positionId}
-            and w.status_flag = '3'
-        </if>
-        <if test="pcFlag != null and pcFlag != ''and pcFlag == '0'">
-            and wbi.person_phone = ${phone}
+            <if test="pcFlag == 1">
+                AND w.base_id = #{baseId}
+                and w.position_id = #{positionId}
+                and w.status_flag = '3'
+            </if>
+            <if test="pcFlag == 0">
+                and wbi.person_phone = ${phone}
+            </if>
         </if>
         <if test="statusFlag != null and statusFlag != ''">
             AND w.status_flag = #{statusFlag}
@@ -78,13 +80,15 @@
                 AND w.in_out_flag = '2'
             </if>
         </if>
-        <if test="pcFlag != null and pcFlag != ''and pcFlag == '1'">
+        <if test="pcFlag != null and pcFlag != ''">
+        <if test="pcFlag == 1">
             AND w.base_id = #{baseId}
             and w.position_id = #{positionId}
             and w.status_flag = '3'
         </if>
-        <if test="pcFlag != null and pcFlag != ''and pcFlag == '0'">
-            and wbi.person_phone = ${phone}
+         <if test="pcFlag == 0">
+             and wbi.person_phone = ${phone}
+         </if>
         </if>
         <if test="statusFlag != null and statusFlag != ''">
             AND w.status_flag = #{statusFlag}