仓库名

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

@@ -177,6 +177,10 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      * 状态英文
      */
     private String statusEn;
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
     /**
      * 审核状态
      */

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

@@ -168,6 +168,10 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      * 状态英文
      */
     private String statusEn;
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
     /**
      * 已称皮重状态（1是）
      */

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

@@ -73,6 +73,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         pageView.put("searchKeyWord", paymentManagement.getSearchKeyWord());
         pageView.put("searchType", paymentManagement.getSearchType());
         pageView.put("pageSize", paymentManagement.getPageSize());
+        pageView.put("warehouseName",paymentManagement.getWarehouseName());
         pageView.put("currentPage", paymentManagement.getCurrentPage());
         pageView.put("businessKeys", businessKeys);
         pageView.put("statusSet", statusSet);

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

@@ -49,6 +49,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         pageView.put("searchKeyWord",qualityInspectionManagement.getSearchKeyWord());
         pageView.put("pageSize",qualityInspectionManagement.getPageSize());
         pageView.put("currentPage",qualityInspectionManagement.getCurrentPage());
+        pageView.put("warehouseName",qualityInspectionManagement.getWarehouseName());
         // 查询销售订单总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<QualityInspectionManagement> dataList = baseMapper.getListByCondition(pageView);
@@ -138,6 +139,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         weighingManagement.setCompId(qualityInspectionManagement.getCompId());
         weighingManagement.setGoodsName(qualityInspectionManagement.getGoodsName());
         weighingManagement.setBinNumber(qualityInspectionManagement.getBinNumber());
+        weighingManagement.setWarehouseName(qualityInspectionManagement.getWarehouseName());
         //状态为已质检
         weighingManagement.setStatus(StatusEnum.INSPECTED.getName());
         weighingManagement.setStatusFlag(StatusEnum.INSPECTED.getFlag());

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

@@ -51,6 +51,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         pageView.put("searchKeyWord",weighingManagement.getSearchKeyWord());
         pageView.put("pageSize",weighingManagement.getPageSize());
         pageView.put("currentPage",weighingManagement.getCurrentPage());
+        pageView.put("warehouseName",weighingManagement.getWarehouseName());
         // 查询销售订单总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<WeighingManagement> dataList = baseMapper.getListByCondition(pageView);
@@ -129,6 +130,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             paymentManagement1.setCarNo(weighingManagement1.getCarNumber());
             paymentManagement1.setGoodsName(weighingManagement1.getGoodsName());
             paymentManagement1.setNetWeight(weighingManagement1.getNetWeight());
+            paymentManagement1.setWarehouseName(weighingManagement1.getWarehouseName());
             //质检信息
             QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
                     .eq("relation_id", weighingManagement1.getRelationId()));

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

@@ -15,6 +15,9 @@
                 AND amount_ing_payable-amount_ed_payable>0
             </if>
         </if>
+        <if test="warehouseName != null and warehouseName != ''">
+            AND warehouse_name= #{warehouseName}
+        </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(payment_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower( customer_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
@@ -67,6 +70,9 @@
                 AND amount_ing_payable-amount_ed_payable>0
             </if>
         </if>
+        <if test="warehouseName != null and warehouseName != ''">
+            AND warehouse_name= #{warehouseName}
+        </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(payment_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower( customer_name) like lower(CONCAT('%',#{searchKeyWord},'%'))

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

@@ -14,6 +14,9 @@
             OR lower(q.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(q.car_number) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
+        <if test="warehouseName != null and warehouseName != ''">
+            AND q.warehouse_name= #{warehouseName}
+        </if>
     </select>
     <!-- 获得销售订单列表 -->
     <select id="getListByCondition" parameterType="Map"
@@ -41,6 +44,9 @@
             OR lower(q.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(q.car_number) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
+        <if test="warehouseName != null and warehouseName != ''">
+            AND q.warehouse_name= #{warehouseName}
+        </if>
         ORDER BY q.quality_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}

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

@@ -13,6 +13,9 @@
             OR lower(car_number) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
         </if>
+        <if test="warehouseName != null and warehouseName != ''">
+            AND warehouse_name= #{warehouseName}
+        </if>
     </select>
     <!-- 获得检斤管理列表 -->
     <select id="getListByCondition" parameterType="Map"
@@ -42,6 +45,9 @@
             OR lower(car_number) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
         </if>
+        <if test="warehouseName != null and warehouseName != ''">
+            AND warehouse_name= #{warehouseName}
+        </if>
         ORDER BY update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}