修改

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

@@ -38,12 +38,14 @@ auth:
     - /webservice/**/*
     - /workflowSync/api/startFlow
     - /office/*
+    - /warehouseInOutInfo/*
     - /auth/api/phoneLogin
     - /system/query/getComanyMgrUrl
     - /saas/**/*
     - /ws/**/*
     - /commonUser/*
     - /procurementPlanInfo/*
+    - /contractManagementInfo/*
   expire-in: 36000
   login-url: /login.html
   logout-url: /auth/api/logout

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

@@ -211,6 +211,14 @@ public class ProcurementPlanInfo extends BaseModel<ProcurementPlanInfo> {
      * 状态英文
      */
     private String statusEn;
+    /**
+     * 显示1隐藏0
+     */
+    private String showFlag;
+    /**
+     * 用户id
+     */
+    private String commonId;
 
     /**
      * 模糊查询

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

@@ -51,6 +51,14 @@ public class PurchaseOrder extends BaseModel<PurchaseOrder> {
      * 客户
      */
     private String customer;
+    /**
+     * 货名key
+     */
+    private String goodsNameKey;
+    /**
+     * 货名
+     */
+    private String goodsName;
     /**
      * 冻结定金（元）
      */

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

@@ -89,6 +89,7 @@ public class ProcurementPlanInfoServiceImpl extends ServiceImpl<ProcurementPlanI
         pageView.put("compId",procurementPlanInfo.getCompId());
         pageView.put("searchKeyWord",procurementPlanInfo.getSearchKeyWord());
         pageView.put("pcFlag",procurementPlanInfo.getPcFlag());
+        pageView.put("showFlag",procurementPlanInfo.getShowFlag());
         pageView.put("receivePrivate",procurementPlanInfo.getReceivePrivate());
         pageView.put("pageSize",procurementPlanInfo.getPageSize());
         pageView.put("currentPage",procurementPlanInfo.getCurrentPage());
@@ -138,11 +139,9 @@ public class ProcurementPlanInfoServiceImpl extends ServiceImpl<ProcurementPlanI
             //更改状态
             if(flag == 0) {
                 if (StatusEnum.PURCHASE_HIDE.getFlag().equals(procurementPlanInfo.getStatusFlag())) {
-                    procurementPlanInfo.setStatusFlag(StatusEnum.PURCHASE_SHOW.getFlag());
-                    procurementPlanInfo.setStatus(StatusEnum.PURCHASE_SHOW.getName());
+                    procurementPlanInfo.setShowFlag(StatusEnum.PURCHASE_SHOW.getFlag());
                 } else {
-                    procurementPlanInfo.setStatusFlag(StatusEnum.PURCHASE_HIDE.getFlag());
-                    procurementPlanInfo.setStatus(StatusEnum.PURCHASE_HIDE.getName());
+                    procurementPlanInfo.setShowFlag(StatusEnum.PURCHASE_HIDE.getFlag());
                 }
                 //更改采购计划信息
                 this.updateById(procurementPlanInfo);

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

@@ -324,6 +324,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
         //  仓位ID
         pageView.put("positionId", warehouseInOutInfo.getPositionId());
         pageView.put("pcFlag", warehouseInOutInfo.getPcFlag());
+        pageView.put("statusFlag", warehouseInOutInfo.getStatusFlag());
         pageView.put("searchType", warehouseInOutInfo.getSearchType());
         pageView.put("pageSize", warehouseInOutInfo.getPageSize());
         pageView.put("currentPage", warehouseInOutInfo.getCurrentPage());

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

@@ -18,6 +18,9 @@
         <if test="pcFlag != null and pcFlag != ''">
             AND comp_id = #{compId}
         </if>
+        <if test="showFlag != null and showFlag != ''">
+            AND show_flag = #{showFlag}
+        </if>
     </select>
     <!-- 获得采购计划列表 -->
     <select id="getListByCondition" parameterType="Map"
@@ -50,6 +53,9 @@
         <if test="pcFlag != null and pcFlag != ''">
             AND comp_id = #{compId}
         </if>
+        <if test="showFlag != null and showFlag != ''">
+            AND show_flag = #{showFlag}
+        </if>
         ORDER BY status DESC , update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}

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

@@ -22,6 +22,9 @@
             AND w.base_id = #{baseId}
             and w.position_id = #{positionId}
         </if>
+        <if test="statusFlag != null and statusFlag != ''">
+            AND w.status_flag = #{statusFlag}
+        </if>
     </select>
     <!-- 流转记录列表查询 -->
     <select id="getListByCondition" parameterType="Map"
@@ -65,6 +68,9 @@
             AND w.base_id = #{baseId}
             and w.position_id = #{positionId}
         </if>
+        <if test="statusFlag != null and statusFlag != ''">
+            AND w.status_flag = #{statusFlag}
+        </if>
         ORDER BY w.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}