From 6c15d505509bd8ecccb15f8145cc62809a4df93b Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Thu, 15 Jun 2023 15:12:15 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/MaterialsafeivtController.java   | 49 +++++--------------
 .../IStIvtMaterialsafeivtService.java         |  9 ++++
 .../mapper/StIvtMaterialsafeivtMapper.java    |  9 +++-
 .../dao/mapper/StIvtMaterialsafeivtMapper.xml | 32 ++++++++++++
 .../service/material/dto/SafeIvtQuery.java    | 23 +++++++++
 .../impl/StIvtMaterialsafeivtServiceImpl.java | 19 +++++++
 .../main/resources/config/application-dev.yml | 10 ++--
 .../src/main/resources/config/application.yml |  2 +-
 .../masterdata_manage/st/safeIvt/index.vue    | 10 ++--
 .../AddDialog.vue                             |  0
 .../ViewDialog.vue                            |  0
 .../index.vue                                 |  0
 .../semiproductIn.js                          |  0
 13 files changed, 114 insertions(+), 49 deletions(-)
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/dto/SafeIvtQuery.java
 rename mes/qd/src/views/wms/storage_manage/semiproduct/{semiProductIn => semiproductIn}/AddDialog.vue (100%)
 rename mes/qd/src/views/wms/storage_manage/semiproduct/{semiProductIn => semiproductIn}/ViewDialog.vue (100%)
 rename mes/qd/src/views/wms/storage_manage/semiproduct/{semiProductIn => semiproductIn}/index.vue (100%)
 rename mes/qd/src/views/wms/storage_manage/semiproduct/{semiProductIn => semiproductIn}/semiproductIn.js (100%)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/MaterialsafeivtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/MaterialsafeivtController.java
index 3ec45201..46494e0f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/MaterialsafeivtController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/MaterialsafeivtController.java
@@ -7,8 +7,12 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.anno.Log;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.masterdata_manage.备份st.service.MaterialsafeivtService;
 import org.nl.wms.masterdata_manage.备份st.service.dto.MaterialsafeivtDto;
+import org.nl.wms.storage_manage.basedata.service.material.IStIvtMaterialsafeivtService;
+import org.nl.wms.storage_manage.basedata.service.material.dto.SafeIvtQuery;
+import org.nl.wms.storage_manage.semimanage.service.shutFrame.dto.ShutQuery;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -28,49 +32,20 @@ import java.util.Map;
 @Slf4j
 public class MaterialsafeivtController {
 
-    private final MaterialsafeivtService materialsafeivtService;
+    private final IStIvtMaterialsafeivtService materialsafeivtService;
 
     @GetMapping
     @Log("查询安全库存")
     @ApiOperation("查询安全库存")
     //@PreAuthorize("@el.check('materialsafeivt:list')")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
-        return new ResponseEntity<>(materialsafeivtService.queryAll(whereJson,page),HttpStatus.OK);
+    public ResponseEntity<Object> query(SafeIvtQuery query, PageQuery page){
+        return new ResponseEntity<>(materialsafeivtService.queryAll(query,page),HttpStatus.OK);
     }
 
-    @PostMapping
-    @Log("新增安全库存")
-    @ApiOperation("新增安全库存")
-    //@PreAuthorize("@el.check('materialsafeivt:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody MaterialsafeivtDto dto){
-        materialsafeivtService.create(dto);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改安全库存")
-    @ApiOperation("修改安全库存")
-    //@PreAuthorize("@el.check('materialsafeivt:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody MaterialsafeivtDto dto){
-        materialsafeivtService.update(dto);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除安全库存")
-    @ApiOperation("删除安全库存")
-    //@PreAuthorize("@el.check('materialsafeivt:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        materialsafeivtService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @PostMapping("/insertSafe")
-    @Log("插入安全库存")
-    @ApiOperation("插入安全库存")
-    //@PreAuthorize("@el.check('structrelamaterial:edit')")
-    public ResponseEntity<Object> insertSafe(@RequestBody Map whereJson){
-        materialsafeivtService.insertSafe(whereJson);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+    @GetMapping
+    @Log("查询拼盘单")
+    @ApiOperation("查询拼盘单")
+    public ResponseEntity<Object> query(ShutQuery query, PageQuery page) {
+        return new ResponseEntity<>(shutframeinvBcpService.pageQuery(query, page), HttpStatus.OK);
     }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/IStIvtMaterialsafeivtService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/IStIvtMaterialsafeivtService.java
index a3087179..8bc6c4d1 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/IStIvtMaterialsafeivtService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/IStIvtMaterialsafeivtService.java
@@ -1,7 +1,10 @@
 package org.nl.wms.storage_manage.basedata.service.material;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.storage_manage.basedata.service.material.dao.StIvtMaterialsafeivt;
+import org.nl.wms.storage_manage.basedata.service.material.dto.SafeIvtQuery;
+import org.nl.wms.storage_manage.semimanage.service.shutFrame.dto.ShutQuery;
 
 /**
  * <p>
@@ -13,4 +16,10 @@ import org.nl.wms.storage_manage.basedata.service.material.dao.StIvtMaterialsafe
  */
 public interface IStIvtMaterialsafeivtService extends IService<StIvtMaterialsafeivt> {
 
+    /**
+     * 分页查询
+     * @param query,page /
+     * @return JSONObject
+     */
+    Object pageQuery(SafeIvtQuery query, PageQuery page);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/dao/mapper/StIvtMaterialsafeivtMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/dao/mapper/StIvtMaterialsafeivtMapper.java
index a203ba0e..85a7655d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/dao/mapper/StIvtMaterialsafeivtMapper.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/dao/mapper/StIvtMaterialsafeivtMapper.java
@@ -1,7 +1,14 @@
 package org.nl.wms.storage_manage.basedata.service.material.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.storage_manage.basedata.service.material.dao.StIvtMaterialsafeivt;
+import org.nl.wms.storage_manage.basedata.service.material.dto.SafeIvtQuery;
+import org.nl.wms.storage_manage.semimanage.service.shutFrame.dto.ShutQuery;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -12,5 +19,5 @@ import org.nl.wms.storage_manage.basedata.service.material.dao.StIvtMaterialsafe
  * @since 2023-05-04
  */
 public interface StIvtMaterialsafeivtMapper extends BaseMapper<StIvtMaterialsafeivt> {
-
+    List<Map> getMstDetail(@Param("query") SafeIvtQuery query, @Param("pageQuery") PageQuery pageQuery);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/dao/mapper/StIvtMaterialsafeivtMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/dao/mapper/StIvtMaterialsafeivtMapper.xml
index bc9394df..4a876f2b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/dao/mapper/StIvtMaterialsafeivtMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/dao/mapper/StIvtMaterialsafeivtMapper.xml
@@ -2,4 +2,36 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.storage_manage.basedata.service.material.dao.mapper.StIvtMaterialsafeivtMapper">
 
+    <select id="getMstDetail" resultType="java.util.Map">
+        SELECT
+        ( CASE WHEN stor.stor_id IS NULL THEN '' ELSE stor.stor_id END ) AS stor_id,
+        ( CASE WHEN stor.stor_code IS NULL THEN 'yclk01' ELSE stor.stor_code END ) stor_code,
+        ( CASE WHEN stor.stor_name IS NULL THEN '原料库' ELSE stor.stor_name END ) stor_name,
+        ( CASE WHEN safe.safe_ivt_down IS NULL THEN 0 ELSE safe.safe_ivt_down END ) safe_ivt_down,
+        mb.material_code,
+        mb.material_name,
+        mb.base_unit_id,
+        mb.material_id,
+        mb.base_unit_id AS qty_unit_id,
+        safe.set_name,
+        safe.set_time,
+        unit.unit_name AS qty_unit_name
+        FROM
+        md_me_materialbase mb
+        LEFT JOIN st_ivt_materialsafeivt safe ON safe.material_id = mb.material_id
+        LEFT JOIN st_ivt_bsrealstorattr stor ON stor.stor_id = safe.stor_id
+        LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = mb.base_unit_id
+        LEFT JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id
+        WHERE
+        1 = 1
+        <if test="query.material_type_id != null and query.material_type_id != ''">
+            mb.material_type_id = #{query.material_type_id}
+        </if>
+        <if test="query.stor_id != null and query.stor_id != ''">
+            stor.stor_id = #{stor_id}
+        </if>
+        <if test="query.material_search != null and query.material_search != ''">
+            (mb.material_code = #{query.material_search} OR mb.material_name = #{query.material_search})
+        </if>
+    </select>
 </mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/dto/SafeIvtQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/dto/SafeIvtQuery.java
new file mode 100644
index 00000000..39943107
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/dto/SafeIvtQuery.java
@@ -0,0 +1,23 @@
+package org.nl.wms.storage_manage.basedata.service.material.dto;
+
+import lombok.Data;
+import org.nl.common.domain.query.BaseQuery;
+import org.nl.common.domain.query.QParam;
+import org.nl.common.enums.QueryTEnum;
+import org.nl.wms.storage_manage.semimanage.service.shutFrame.dao.StIvtShutframeinvBcp;
+
+/*
+ * @author ZZQ
+ * @Date 2023/5/4 19:49
+ */
+@Data
+public class SafeIvtQuery extends BaseQuery<StIvtShutframeinvBcp> {
+
+
+    private String stor_id;
+
+    private String material_type_id;
+
+    private String material_search;
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/impl/StIvtMaterialsafeivtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/impl/StIvtMaterialsafeivtServiceImpl.java
index 55dbe982..9aa3c794 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/impl/StIvtMaterialsafeivtServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/material/impl/StIvtMaterialsafeivtServiceImpl.java
@@ -1,11 +1,21 @@
 package org.nl.wms.storage_manage.basedata.service.material.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import org.mvel2.ast.Safe;
+import org.nl.common.TableDataInfo;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.storage_manage.basedata.service.material.IStIvtMaterialsafeivtService;
 import org.nl.wms.storage_manage.basedata.service.material.dao.StIvtMaterialsafeivt;
 import org.nl.wms.storage_manage.basedata.service.material.dao.mapper.StIvtMaterialsafeivtMapper;
+import org.nl.wms.storage_manage.basedata.service.material.dto.SafeIvtQuery;
+import org.nl.wms.storage_manage.semimanage.service.shutFrame.dto.ShutQuery;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 物料安全库存设置表 服务实现类
@@ -17,4 +27,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class StIvtMaterialsafeivtServiceImpl extends ServiceImpl<StIvtMaterialsafeivtMapper, StIvtMaterialsafeivt> implements IStIvtMaterialsafeivtService {
 
+    @Override
+    public Object pageQuery(SafeIvtQuery query, PageQuery pageQuery) {
+        Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
+        List<Map> mst_detail = this.baseMapper.getMstDetail(query, pageQuery);
+        TableDataInfo<Map> build = TableDataInfo.build(mst_detail);
+        build.setTotalElements(page.getTotal());
+        return build;
+    }
+
 }
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
index 1dee4cc4..e68dfb5c 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
@@ -14,19 +14,19 @@ spring:
   elasticsearch:
     rest:
       #uris: 172.31.185.110:8200,172.31.154.9:8200 #内网
-      #      uris: 47.96.133.178:8200 #外网
-      uris: http://192.168.46.225:9200 #外网
+       uris: 47.96.133.178:8200 #外网
+#      uris: http://192.168.46.225:9200 #外网
 #      username: elastic
 #      password: 123456
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
-#      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+#      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_xc}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       username: ${DB_USER:root}
 #      password: ${DB_PWD:123456}
-      password: ${DB_PWD:123456}
+      password: ${DB_PWD:Root.123456}
 
       # 初始连接数
       initial-size: 5
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application.yml b/mes/hd/nladmin-system/src/main/resources/config/application.yml
index cdab71b2..0d141f34 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application.yml
@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
   data:
diff --git a/mes/qd/src/views/wms/masterdata_manage/st/safeIvt/index.vue b/mes/qd/src/views/wms/masterdata_manage/st/safeIvt/index.vue
index a8bba057..1e3f2ada 100644
--- a/mes/qd/src/views/wms/masterdata_manage/st/safeIvt/index.vue
+++ b/mes/qd/src/views/wms/masterdata_manage/st/safeIvt/index.vue
@@ -10,7 +10,7 @@
         @change="storChange"
       >
         <el-option
-          v-for="item in stors"
+          v-for="item in storlist"
           :key="item.stor_id"
           :label="item.stor_name"
           :value="item.stor_id"
@@ -82,7 +82,7 @@ import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
-import crudStorattr from '@/api/wms/basedata/st/storattr'
+import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudClassstandard from '@/api/wms/basedata/master/classstandard'
@@ -115,7 +115,7 @@ export default {
   },
   data() {
     return {
-      stors: [],
+      storlist: [],
       classes: [],
       class_idStr: null,
       materOpt_code: '02',
@@ -153,8 +153,8 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
-      this.stors = res.content
+    crudStorattr.getStor({}).then(res => {
+      this.storlist = res.content
     })
     const param = {
       'materOpt_code': this.materOpt_code
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/AddDialog.vue
similarity index 100%
rename from mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue
rename to mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/AddDialog.vue
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/ViewDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/ViewDialog.vue
similarity index 100%
rename from mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/ViewDialog.vue
rename to mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/ViewDialog.vue
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/index.vue
similarity index 100%
rename from mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue
rename to mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/index.vue
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/semiproductIn.js b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn.js
similarity index 100%
rename from mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/semiproductIn.js
rename to mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn.js