Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun

winsea-haixin-platform-backend/src/main/resources/application-dev.yml

@@ -12,6 +12,9 @@ spring:
 # password: yinghai.2019
 #    url: jdbc:mysql://192.168.26.6:3306/winsea_haixin?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
 #    username: root
+  password: Ccj841968545
+    url: jdbc:mysql://47.100.3.209:3306/yilaingyiyun?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
   redis:
     database: 0
     host: 192.168.26.10

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

@@ -308,6 +308,16 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      */
     @TableField(exist = false)
     private Float contractPrice;
+    /**
+     * 检斤单
+     */
+    @TableField(exist = false)
+    private String weighingPictureAddress;
+    /**
+     * 质检单
+     */
+    @TableField(exist = false)
+    private String qualityInspectionPictureAddress;
 
     @Override
     protected Serializable pkVal() {

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

@@ -467,6 +467,7 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
         //公司id
         pageView.put("compId", identityAuthenticationInfo.getCompId());
         pageView.put("authenticationStatusKey", identityAuthenticationInfo.getAuthenticationStatusKey());
+        pageView.put("searchKeyWord", identityAuthenticationInfo.getSearchKeyWord());
         List<IdentityAuthenticationInfo> dataList = this.baseMapper.getIdentityInfoByCondition(pageView);
         return dataList;
     }

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

@@ -314,7 +314,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
             for (InOutWarehouseTask inOutWarehouseTaska : dataList) {
 
                 //定义累计退库量
-                String stockReturnCount = "";
+                String stockReturnCount = "0";
 
                 //查询退库量
                 List<InOutWarehouseTask> inOutWarehouseTaskList = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()

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

@@ -112,6 +112,12 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                         .eq("relation_id", paymentManagement1.getRelationId()));
                 if (weighingManagement!=null){
                     paymentManagement1.setContractPrice(weighingManagement.getContractPrice());
+                    paymentManagement1.setWeighingPictureAddress(weighingManagement.getPictureAddress());
+                }
+                QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
+                        .eq("relation_id", paymentManagement1.getRelationId()));
+                if (qualityInspectionManagement!=null){
+                    paymentManagement1.setQualityInspectionPictureAddress(qualityInspectionManagement.getPictureAddress());
                 }
                 String taskId = "";
                 // 只有待审核状态才有taskId

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

@@ -86,6 +86,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
     private IContractManagementInfoService contractManagementInfoService;
     @Autowired
     private GeTuiUtils geTuiUtils;
+    @Autowired
+    private IStockSaleReceiptReportService stockSaleReceiptReportService;
 
     /**
      * 待完成页面列表
@@ -502,6 +504,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockPurchaseReceiptReport.setAmountIngPayable
                                 (warehouseInOutInfo.getNetWeight() *
                                         (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())) - Float.valueOf(warehouseInOutInfo.getDeductionAmount())));
+                        stockPurchaseReceiptReport.setAmountEdPayable(0.0f);
+                        stockPurchaseReceiptReport.setAmountNotPayable(stockPurchaseReceiptReport.getAmountIngPayable());
+                        stockPurchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
+                        stockPurchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
                     }
 
                     // 客户确认
@@ -609,89 +615,141 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         throw new YException(YExceptionEnum.WAREHOUSE_NO_ERROR);
                     }
 
-                    // 销售出库统计
-                    SalesDeliveryReport salesDeliveryReport = new SalesDeliveryReport();
-                    salesDeliveryReport.setId(IdGenerator.generateUUID());
-                    salesDeliveryReport.setCompId(warehouseBaseInfo.getCompId());
-                    salesDeliveryReport.setContractNo(warehouseInOutInfo.getContractNo());
-                    salesDeliveryReport.setGoodsName(warehouseInOutInfo.getGoodsName());
-                    salesDeliveryReport.setGoodsNameKey(warehouseInOutInfo.getGoodsNameKey());
-                    salesDeliveryReport.setPositionNumber(warehouseInOutInfo.getBinNumber());
-                    salesDeliveryReport.setCarNo(warehouseInOutInfo.getCarNo());
-                    salesDeliveryReport.setTranCarNo(warehouseInOutInfo.getTranCarNo());
-                    salesDeliveryReport.setRetrievalDate(warehouseInOutInfo.getInOutDate());
-                    salesDeliveryReport.setProtein(warehouseInOutDetail.getProtein());
-                    salesDeliveryReport.setWaterContent(warehouseInOutDetail.getWaterContent());
-                    salesDeliveryReport.setNetWeight(warehouseInOutInfo.getNetWeight());
-                    salesDeliveryReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
-                    salesDeliveryReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
-                    salesDeliveryReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
-                    if (saleOrder != null) {
-                        salesDeliveryReport.setUnitPrice(saleOrder.getUnitPrice());
-                        salesDeliveryReport.setInvoiceFee(saleOrder.getInvoiceFee());
-                        //期货
-                        if (saleOrder.getBasis()!=null){
-                            salesDeliveryReport.setBasisPrice(saleOrder.getBasis());
-                            BigDecimal unitPrice = new BigDecimal(Float.toString(salesDeliveryReport.getUnitPrice()));
-                            BigDecimal basis = new BigDecimal(Float.toString(salesDeliveryReport.getBasisPrice()));
-                            BigDecimal invoiceFee = new BigDecimal(Float.toString(salesDeliveryReport.getInvoiceFee()));
-                            salesDeliveryReport.setSettlementPrice(unitPrice.add(basis).add(invoiceFee).floatValue());
-                            tranCarInfo.setSettlementPrice(saleOrder.getUnitPrice() + saleOrder.getBasis() + saleOrder.getInvoiceFee());
-                        }
-                        //现货
-                        else{
-                            BigDecimal unitPrice = new BigDecimal(Float.toString(salesDeliveryReport.getUnitPrice()));
-                            BigDecimal invoiceFee = new BigDecimal(Float.toString(salesDeliveryReport.getInvoiceFee()));
-                            salesDeliveryReport.setSettlementPrice(unitPrice.add(invoiceFee).floatValue());
-                            tranCarInfo.setSettlementPrice(saleOrder.getUnitPrice()+ saleOrder.getInvoiceFee());
+                    //查询期货现货合同
+                    ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                            .eq("contract_no",warehouseInOutInfo.getContractNo()));
+                    if("2".equals(contractManagementInfo.getGoodsType())){
+                        // 期货销售出库统计
+                        SalesDeliveryReport salesDeliveryReport = new SalesDeliveryReport();
+                        salesDeliveryReport.setId(IdGenerator.generateUUID());
+                        salesDeliveryReport.setCompId(warehouseBaseInfo.getCompId());
+                        salesDeliveryReport.setContractNo(warehouseInOutInfo.getContractNo());
+                        salesDeliveryReport.setGoodsName(warehouseInOutInfo.getGoodsName());
+                        salesDeliveryReport.setGoodsNameKey(warehouseInOutInfo.getGoodsNameKey());
+                        salesDeliveryReport.setPositionNumber(warehouseInOutInfo.getBinNumber());
+                        salesDeliveryReport.setCarNo(warehouseInOutInfo.getCarNo());
+                        salesDeliveryReport.setTranCarNo(warehouseInOutInfo.getTranCarNo());
+                        salesDeliveryReport.setRetrievalDate(warehouseInOutInfo.getInOutDate());
+                        salesDeliveryReport.setProtein(warehouseInOutDetail.getProtein());
+                        salesDeliveryReport.setWaterContent(warehouseInOutDetail.getWaterContent());
+                        salesDeliveryReport.setNetWeight(warehouseInOutInfo.getNetWeight());
+                        salesDeliveryReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
+                        salesDeliveryReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
+                        salesDeliveryReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
+                        if (saleOrder != null) {
+                            salesDeliveryReport.setUnitPrice(saleOrder.getUnitPrice());
+                            salesDeliveryReport.setInvoiceFee(saleOrder.getInvoiceFee());
+                            //期货
+                            if (saleOrder.getBasis()!=null){
+                                salesDeliveryReport.setBasisPrice(saleOrder.getBasis());
+                                BigDecimal unitPrice = new BigDecimal(Float.toString(salesDeliveryReport.getUnitPrice()));
+                                BigDecimal basis = new BigDecimal(Float.toString(salesDeliveryReport.getBasisPrice()));
+                                BigDecimal invoiceFee = new BigDecimal(Float.toString(salesDeliveryReport.getInvoiceFee()));
+                                salesDeliveryReport.setSettlementPrice(unitPrice.add(basis).add(invoiceFee).floatValue());
+                                tranCarInfo.setSettlementPrice(saleOrder.getUnitPrice() + saleOrder.getBasis() + saleOrder.getInvoiceFee());
+                            }
+                            //现货
+//                            else{
+//                                BigDecimal unitPrice = new BigDecimal(Float.toString(salesDeliveryReport.getUnitPrice()));
+//                                BigDecimal invoiceFee = new BigDecimal(Float.toString(salesDeliveryReport.getInvoiceFee()));
+//                                salesDeliveryReport.setSettlementPrice(unitPrice.add(invoiceFee).floatValue());
+//                                tranCarInfo.setSettlementPrice(saleOrder.getUnitPrice()+ saleOrder.getInvoiceFee());
+//                            }
+                            salesDeliveryReport.setCustomerName(saleOrder.getBuyer());
+                            salesDeliveryReport.setCollectionIngPayable(CalculationUtil.mulToFloat(salesDeliveryReport.getSettlementPrice(), salesDeliveryReport.getNetWeight()));
+                            salesDeliveryReport.setCollectionEdPayable(0f);
+                            salesDeliveryReport.setCollectionNotPayable(salesDeliveryReport.getCollectionIngPayable());
+                            tranCarInfoService.insert(tranCarInfo);
                         }
-                        salesDeliveryReport.setCustomerName(saleOrder.getBuyer());
-                        salesDeliveryReport.setCollectionIngPayable(CalculationUtil.mulToFloat(salesDeliveryReport.getSettlementPrice(), salesDeliveryReport.getNetWeight()));
-                        salesDeliveryReport.setCollectionEdPayable(0f);
-                        salesDeliveryReport.setCollectionNotPayable(salesDeliveryReport.getCollectionIngPayable());
-                        tranCarInfoService.insert(tranCarInfo);
-                    }
 
-                    // 客户确认
-                    TranCarInfo tranCarInfo1 = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
-                            .eq("contract_no", warehouseInOutInfo.getContractNo())
-                            .eq("car_no", warehouseInOutInfo.getCarNo())
-                            .eq("delete_flag", "0"));
-                    if (tranCarInfo1 != null && "3".equals(tranCarInfo1.getConfirmFlag())) {
-                        salesDeliveryReport.setCustomerConfirmationStatusFlag("1");
-                        salesDeliveryReport.setCustomerConfirmationStatus("是");
-                        geTuiUtils.pushByCid("发货通知", "您的合同车辆：" + warehouseInOutInfo.getCarNo() + "已发出", saleOrder.getCommonId());
-                        tesk(warehouseInOutInfo, "1");
-                    } else {
-                        salesDeliveryReport.setCustomerConfirmationStatusFlag("3");
-                        salesDeliveryReport.setCustomerConfirmationStatus("否");
-                    }
-                    salesDeliveryReportService.insert(salesDeliveryReport);
+                        // 客户确认
+                        TranCarInfo tranCarInfo1 = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                .eq("contract_no", warehouseInOutInfo.getContractNo())
+                                .eq("car_no", warehouseInOutInfo.getCarNo())
+                                .eq("delete_flag", "0"));
+                        if (tranCarInfo1 != null && "3".equals(tranCarInfo1.getConfirmFlag())) {
+                            salesDeliveryReport.setCustomerConfirmationStatusFlag("1");
+                            salesDeliveryReport.setCustomerConfirmationStatus("是");
+                            geTuiUtils.pushByCid("发货通知", "您的合同车辆：" + warehouseInOutInfo.getCarNo() + "已发出", saleOrder.getCommonId());
+                            tesk(warehouseInOutInfo, "1");
+                        } else {
+                            salesDeliveryReport.setCustomerConfirmationStatusFlag("3");
+                            salesDeliveryReport.setCustomerConfirmationStatus("否");
+                        }
+                        salesDeliveryReportService.insert(salesDeliveryReport);
+
+                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(salesDeliveryReport.getWorkflowId());
+                        // 不是退回的单子
+                        if (isStartWorkflow) {
+                            Workflow workflow = workflowService
+                                    .findLatestWorkflowByBusinessCodeByApp(saleOrder.getCompId(), "SALE-RECEIPT-REPORT");
+                            // 没配置审核流程，直接结束并处理信息
+                            if (workflow == null) {
+                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+                            }
+                            // 开启审核流
+                            else {
 
-                    boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(salesDeliveryReport.getWorkflowId());
-                    // 不是退回的单子
-                    if (isStartWorkflow) {
-                        Workflow workflow = workflowService
-                                .findLatestWorkflowByBusinessCodeByApp(saleOrder.getCompId(), "SALE-RECEIPT-REPORT");
-                        // 没配置审核流程，直接结束并处理信息
-                        if (workflow == null) {
-                            throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+                                // 设置状态 已提交审核
+                                salesDeliveryReport.setWorkflowId(workflow.getId());
+                                salesDeliveryReportService.updateById(salesDeliveryReport);
+                                workflowService.startInstance(workflow.getId(), salesDeliveryReport.getId());
+                            }
                         }
-                        // 开启审核流
+                        // 退回的单子 再启用
                         else {
 
-                            // 设置状态 已提交审核
-                            salesDeliveryReport.setWorkflowId(workflow.getId());
                             salesDeliveryReportService.updateById(salesDeliveryReport);
-                            workflowService.startInstance(workflow.getId(), salesDeliveryReport.getId());
+                            workflowService.activateInstance(salesDeliveryReport.getWorkflowId(), salesDeliveryReport.getId());
                         }
-                    }
-                    // 退回的单子 再启用
-                    else {
+                    }else {
+                        //现货销售统计
+                        StockSaleReceiptReport stockSaleReceiptReport = new StockSaleReceiptReport();
+                        stockSaleReceiptReport.setId(IdGenerator.generateUUID());
+                        stockSaleReceiptReport.setCompId(warehouseBaseInfo.getCompId());
+                        stockSaleReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
+                        stockSaleReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
+                        stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
+                        stockSaleReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
+                        stockSaleReceiptReport.setTare(warehouseInOutInfo.getTare());
+                        stockSaleReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
+                        if("1".equals(warehouseInOutInfo.getTaskTypeKey())){
+                            stockSaleReceiptReport.setDeliveryDate(warehouseInOutInfo.getInOutDate());
+                            stockSaleReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
+                            stockSaleReceiptReport.setAmountIngReceivable(warehouseInOutInfo.getUnitPrice() * stockSaleReceiptReport.getSettlementWeight());
+                        }else if ("4".equals(warehouseInOutInfo.getTaskTypeKey())){
+                            stockSaleReceiptReport.setReturnDate(warehouseInOutInfo.getInOutDate());
+                            stockSaleReceiptReport.setSettlementWeight(-warehouseInOutInfo.getNetWeight());
+                            stockSaleReceiptReport.setAmountIngReceivable(0.0f);
+                            stockSaleReceiptReport.setReturnFlag("1");
+                        }
+                        stockSaleReceiptReportService.insert(stockSaleReceiptReport);
+                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockSaleReceiptReport.getWorkflowId());
+                        // 不是退回的单子
+                        if (isStartWorkflow) {
+                            Workflow workflow = workflowService
+                                    .findLatestWorkflowByBusinessCodeByApp(saleOrder.getCompId(), "SALE-RECEIPT-REPORT");
+                            // 没配置审核流程，直接结束并处理信息
+                            if (workflow == null) {
+                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+                            }
+                            // 开启审核流
+                            else {
 
-                        salesDeliveryReportService.updateById(salesDeliveryReport);
-                        workflowService.activateInstance(salesDeliveryReport.getWorkflowId(), salesDeliveryReport.getId());
+                                // 设置状态 已提交审核
+                                stockSaleReceiptReport.setWorkflowId(workflow.getId());
+                                stockSaleReceiptReportService.updateById(stockSaleReceiptReport);
+                                workflowService.startInstance(workflow.getId(), stockSaleReceiptReport.getId());
+                            }
+                        }
+                        // 退回的单子 再启用
+                        else {
+
+                            stockSaleReceiptReportService.updateById(stockSaleReceiptReport);
+                            workflowService.activateInstance(stockSaleReceiptReport.getWorkflowId(), stockSaleReceiptReport.getId());
+                        }
                     }
+
                 }
                 warehouseInOutInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
                 warehouseInOutInfo.setStatus(StatusEnum.SUBMITTED.getName());

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

@@ -55,16 +55,16 @@
         and delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND task_status_key = '1'
+                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '1'
             </if>
             <if test="searchType == 2">
-                AND task_status_key = '3'
+                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '3'
             </if>
             <if test="searchType == 3">
-                AND task_status_key = '5'
+                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '5'
             </if>
             <if test="searchType == 4">
-                AND task_status_key = '7'
+                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '7'
             </if>
         </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
@@ -95,7 +95,8 @@
         b.weight as weightIn,
         a.predict_date as predictDate,
         a.publisher as publisher,
-        IFNULL(b.task_status,a.task_status) as taskStatus,
+--         IFNULL(b.task_status,a.task_status) as taskStatus,
+        case when b.task_status = '已完成' then '已完成' else a.task_status end as taskStatus,
         a.establish_date as establishDate,
         a.relevance_id as relevanceId,
         a.task_type_key as taskTypeKey,
@@ -120,16 +121,16 @@
         </if>
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND IFNULL(b.task_status_key,a.task_status_key) = '1'
+                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '1'
             </if>
             <if test="searchType == 2">
-                AND IFNULL(b.task_status_key,a.task_status_key) = '3'
+                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '3'
             </if>
             <if test="searchType == 3">
-                AND IFNULL(b.task_status_key,a.task_status_key) = '5'
+                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '5'
             </if>
             <if test="searchType == 4">
-                AND IFNULL(b.task_status_key,a.task_status_key) = '7'
+                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '7'
             </if>
         </if>
         ORDER BY a.task_status DESC , a.establish_date DESC

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

@@ -19,6 +19,12 @@
             <if test="searchType == 4">
                 AND actual_collectionment-amount_ed_collectionable=0
             </if>
+            <if test="searchType == 5">
+                AND amount_ing_payable-amount_ed_payable>0
+            </if>
+            <if test="searchType == 6">
+                AND amount_ed_payable=amount_ing_payable
+            </if>
         </if>
         <if test="warehouseName != null and warehouseName != ''">
             AND warehouse_name= #{warehouseName}
@@ -90,6 +96,7 @@
         customer_name as customerName,
         collection_date as collectionDate,
         status,
+        picture_address as pictureAddress,
         approve_status as approveStatus,
         status_flag as statusFlag,
         update_date as updateDate,
@@ -107,6 +114,12 @@
             <if test="searchType == 4">
                 AND actual_collectionment-amount_ed_collectionable=0
             </if>
+            <if test="searchType == 5">
+                AND amount_ing_payable-amount_ed_payable>0
+            </if>
+            <if test="searchType == 6">
+                AND amount_ed_payable=amount_ing_payable
+            </if>
         </if>
         <if test="managementType != null and managementType != ''">
             AND management_type = #{managementType}

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

@@ -9,6 +9,7 @@
         WHERE
         q.comp_id = #{compId}
         AND q.warehouse_name = #{warehouseName}
+        AND TO_DAYS(q.create_date) = TO_DAYS(NOW())
     </select>
     <!-- 仓库数量包括已删除的 -->
     <select id="getWareHouseCountByCondition" parameterType="Map" resultType="java.lang.Integer">

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

@@ -18,7 +18,7 @@
                 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}