代码更新

2022-07-19 10:24:59 +08:00
parent 6d442bb4cc
commit f9669110ec
6 changed files with 362 additions and 1 deletions
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/MaterialsafeivtController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/MaterialsafeivtController.java
@@ -37,6 +37,14 @@ public class MaterialsafeivtController {
        return new ResponseEntity<>(materialsafeivtService.queryAll(whereJson,page),HttpStatus.OK);
    }

+    @GetMapping("/bjsafeivt")
+    @Log("查询备件安全库存")
+    @ApiOperation("查询备件安全库存")
+    //@PreAuthorize("@el.check('materialsafeivt:list')")
+    public ResponseEntity<Object> bjsafeivt(@RequestParam Map whereJson, Pageable page){
+        return new ResponseEntity<>(materialsafeivtService.bjsafeivt(whereJson,page),HttpStatus.OK);
+    }
+
    @PostMapping
    @Log("新增安全库存")
    @ApiOperation("新增安全库存")
@@ -72,4 +80,13 @@ public class MaterialsafeivtController {
        materialsafeivtService.insertSafe(whereJson);
        return new ResponseEntity<>(HttpStatus.CREATED);
    }
+
+    @PostMapping("/insertSafeBj")
+    @Log("插入备件安全库存")
+    @ApiOperation("插入备件安全库存")
+    //@PreAuthorize("@el.check('structrelamaterial:edit')")
+    public ResponseEntity<Object> insertSafeBj(@RequestBody Map whereJson){
+        materialsafeivtService.insertSafeBj(whereJson);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
 }
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/MaterialsafeivtService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/MaterialsafeivtService.java
@@ -65,5 +65,13 @@ public interface MaterialsafeivtService {
    void deleteAll(Long[] ids);

    void insertSafe(Map whereJson);
+    void insertSafeBj(Map whereJson);

+    /**
+     * 查询数据分页
+     * @param whereJson 条件
+     * @param page 分页参数
+     * @return Map<String,Object>
+     */
+    Map<String,Object> bjsafeivt(Map whereJson, Pageable page);
 }
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/MaterialsafeivtServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/MaterialsafeivtServiceImpl.java
@@ -94,6 +94,60 @@ public class MaterialsafeivtServiceImpl implements MaterialsafeivtService {
        }
    }

+    @Override
+    public void insertSafeBj(Map whereJson) {
+        Long currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getNickName();
+        String now = DateUtil.now();
+        String stor_id = (String) whereJson.get("stor_id");
+        ArrayList<HashMap> rows = (ArrayList<HashMap>) whereJson.get("rows");
+        for (int i = 0; i < rows.size(); i++) {
+            HashMap<String, String> row = rows.get(i);
+            WQLObject.getWQLObject("ST_IVT_MaterialSafeIvt").delete("stor_id = '" + stor_id + "' AND material_id = '" + row.get("material_id") + "'");
+            JSONObject jo = new JSONObject();
+            jo.put("stor_id", stor_id);
+            jo.put("safe_ivt_down", row.get("safe_ivt_down"));
+            jo.put("material_id", row.get("material_id"));
+            jo.put("safe_ivt_up", row.get("safe_ivt_up"));
+            jo.put("qty_unit_id", row.get("qty_unit_id"));
+            jo.put("qty_unit_name", row.get("qty_unit_name"));
+            jo.put("set_id", currentUserId + "");
+            jo.put("set_name", nickName);
+            jo.put("set_time", now);
+            WQLObject.getWQLObject("ST_IVT_MaterialSafeIvt").insert(jo);
+        }
+    }
+
+    @Override
+    public Map<String, Object> bjsafeivt(Map whereJson, Pageable page) {
+        String search = (String) whereJson.get("search");
+        String class_idStr = (String) whereJson.get("class_idStr");
+        HashMap<String, String> map = new HashMap<>();
+        if (!StrUtil.isEmpty(search)) {
+            //处理转义字符
+            if (search.contains("\\")) search = search.replace("\\", "\\\\\\");
+            map.put("search", "%" + search + "%");
+        }
+        String material_type_id = (String) whereJson.get("material_type_id");
+        //处理物料当前节点的所有子节点
+        if (!StrUtil.isEmpty(material_type_id)) {
+            map.put("material_type_id", material_type_id);
+            String classIds = classstandardService.getChildIdStr(material_type_id);
+            map.put("classIds", classIds);
+        } else if (ObjectUtil.isNotEmpty(class_idStr)) {
+            String classIds = classstandardService.getAllChildIdStr(class_idStr);
+            map.put("classIds", classIds);
+        } else {
+            String classIds = classstandardService.getAllChildIdStr(MaterOptTypeEnum.SPARE.getClass_idStr());
+            map.put("classIds", classIds);
+        }
+
+        map.put("flag", "2");
+        map.put("stor_id", MapUtil.getStr(whereJson, "stor_id"));
+        JSONObject jo = WQL.getWO("QST_IVT_MATERIALSAFE").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "set_time desc");
+        return jo;
+    }
+
    @Override
    public List<MaterialsafeivtDto> queryAll(Map whereJson) {
        WQLObject wo = WQLObject.getWQLObject("st_ivt_materialsafeivt");
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_IVT_MATERIALSAFE.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_IVT_MATERIALSAFE.wql
@@ -81,5 +81,46 @@
 		ENDPAGEQUERY
 	ENDIF

+	IF 输入.flag = "2"
+		PAGEQUERY
+			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 'bjk01' 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,
+                (case when safe.safe_ivt_up is null then 999999 else safe.safe_ivt_up end) safe_ivt_up,
+                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
+           OPTION 输入.classIds <> ""
+                    mb.material_type_id in 输入.classIds
+           ENDOPTION
+           OPTION 输入.stor_id <> ""
+                    stor.stor_id = 输入.stor_id
+           ENDOPTION
+            OPTION 输入.search <> ""
+                    (
+                    mb.material_code like 输入.search
+                    OR
+                    mb.material_name like 输入.search
+                    )
+            ENDOPTION
+			ENDSELECT
+		ENDPAGEQUERY
+	ENDIF
+


--- a/mes/qd/src/api/wms/basedata/st/materialsafeivt.js
+++ b/mes/qd/src/api/wms/basedata/st/materialsafeivt.js
@@ -32,4 +32,12 @@ export function insertSafe(data) {
  })
 }

-export default { add, edit, del, insertSafe }
+export function insertSafeBj(data) {
+  return request({
+    url: 'api/materialsafeivt/insertSafeBj',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, insertSafe, insertSafeBj }
--- a/mes/qd/src/views/wms/basedata/em/bjsafeivt/index.vue
+++ b/mes/qd/src/views/wms/basedata/em/bjsafeivt/index.vue
@@ -0,0 +1,233 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="仓库">
+            <el-select
+              v-model="query.stor_id"
+              placeholder="所属仓库"
+              clearable
+              class="filter-item"
+              @change="storChange"
+            >
+              <el-option
+                v-for="item in stors"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="物料类型">
+            <treeselect
+              v-model="query.material_type_id"
+              :load-options="loadClass"
+              :options="classes"
+              class="filter-item"
+              style="width: 200px;"
+              placeholder="物料类型"
+            />
+          </el-form-item>
+          <el-form-item label="模糊搜索">
+            <el-input
+              v-model="query.search"
+              clearable
+              style="width: 200px"
+              size="mini"
+              placeholder="输入物料编码或名称"
+              prefix-icon="el-icon-search"
+              class="filter-item"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          @click="save"
+        >
+          保存
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column prop="stor_code" label="仓库编码" />
+        <el-table-column prop="stor_name" label="仓库名称" />
+        <el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="material_name" label="物料名称" min-width="200" show-overflow-tooltip />
+        <el-table-column prop="safe_ivt_down" label="安全库存下限" width="150">
+          <template slot-scope="scope">
+            <el-input-number
+              v-model="crud.data[scope.$index].safe_ivt_down"
+              size="small"
+              :controls="false"
+              controls-position="right"
+              precision="3"
+              :min="0"
+              @change="change($event,crud.data[scope.$index],scope.$index)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="safe_ivt_up" label="安全库存上限" width="150">
+          <template slot-scope="scope">
+            <el-input-number
+              v-model="crud.data[scope.$index].safe_ivt_up"
+              size="small"
+              :controls="false"
+              controls-position="right"
+              precision="3"
+              :min="0"
+              @change="change($event,crud.data[scope.$index],scope.$index)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="qty_unit_name" label="单位" />
+        <el-table-column prop="set_time" label="设置时间" min-width="110" show-overflow-tooltip />
+        <el-table-column prop="set_name" label="设置人" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudMaterialsafeivt from '@/api/wms/basedata/st/materialsafeivt'
+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 Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import crudClassstandard from '@/api/wms/basedata/master/classstandard'
+import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
+
+const defaultForm = {
+  stor_id: null,
+  material_id: null,
+  safe_ivt_down: null,
+  safe_ivt_up: null,
+  qty_unit_id: null,
+  qty_unit_name: null,
+  set_id: null,
+  set_name: null,
+  set_time: null
+}
+export default {
+  name: 'Bjsafeivt',
+  components: { pagination, crudOperation, rrOperation, Treeselect },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '安全库存',
+      optShow: { reset: true },
+      url: 'api/materialsafeivt/bjsafeivt',
+      idField: 'material_id',
+      sort: 'material_id,desc',
+      crudMethod: { ...crudMaterialsafeivt }
+    })
+  },
+  data() {
+    return {
+      stors: [],
+      classes: [],
+      class_idStr: null,
+      materOpt_code: '23',
+      stor_id: '',
+      permission: {},
+      rules: {
+      }
+    }
+  },
+  created() {
+    crudStorattr.getStor({ 'is_attachment': '1' }).then(res => {
+      this.stors = res.content
+    })
+    const param = {
+      'materOpt_code': this.materOpt_code
+    }
+    crudMaterialbase.getMaterOptType(param).then(res => {
+      this.class_idStr = res.class_idStr
+      this.crud.query.class_idStr = this.class_idStr
+      this.queryClassId()
+    })
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    queryClassId() {
+      const param = {
+        'class_idStr': this.class_idStr
+      }
+      crudClassstandard.queryClassById(param).then(res => {
+        this.classes = res.content.map(obj => {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
+    // 获取弹窗内部门数据
+    loadClass({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    },
+    save() {
+      if (this.stor_id === '') {
+        this.crud.notify('请选择仓库', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      const data = {}
+      data.stor_id = this.stor_id
+      data.rows = this.crud.data
+      crudMaterialsafeivt.insertSafeBj(data).then(() => {
+        this.crud.dleChangePage(1)
+        this.crud.editSuccessNotify()
+        this.crud.refresh()
+      })
+    },
+    storChange(val) {
+      this.stor_id = val
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>