Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mes/qd/src/views/wms/basedata/em/bjsafeivt/index.vue

mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java

@@ -663,7 +663,7 @@ public class PhysicalMstServiceImpl implements PhysicalMstService {
                 jsonPhyMst.put("sysdeptid", deptId);
                 jsonPhyMst.put("result", "");
                 jsonPhyMst.put("grade", "");
-                jsonPhyMst.put("is_effective", "0");
+                jsonPhyMst.put("is_effective", "1");
                 phyMstTab.insert(jsonPhyMst);
                 // 新增新的理化单明细表
                 for (int i = 0; i < oldPhydtlArr.size(); i++) {
@@ -673,7 +673,10 @@ public class PhysicalMstServiceImpl implements PhysicalMstService {
                     phyDtlTab.insert(oldPhydtl);
                 }
                 // 将老的理化单主表设置为 无效，将新的质检单设置为有效
-                this.setValid(jsonPhyMst);
+                HashMap<String,String> map = new HashMap<String,String>();
+                map.put("is_effective", "0");
+                phyMstTab.update(map,"material_id='" + material_id + "' and pcsn = '" + pcsn + "' and inspection_id <> '" + jsonPhyMst.getString("inspection_id") + "'");
+
                 // 更新一级质检单明细表
                 JSONObject sheetdtl = sheetDtlTab.query("material_id = '" + jsonPhyMst.getString("material_id") + "' and pcsn = '" + jsonPhyMst.getString("pcsn") + "'").uniqueResult(0);
                 sheetdtl.put("bill_status", "30");

mes/qd/src/views/wms/basedata/em/bjsafeivt/index.vue

@@ -71,14 +71,11 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column
+        <el-table-column type="selection" min-width="35" />
-          type="selection"
-          width="55"
-        />
         <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_code" label="物料编码" min-width="150" />
-        <el-table-column prop="material_name" label="物料名称" min-width="200" show-overflow-tooltip />
+        <el-table-column prop="material_name" label="物料名称" min-width="200" />
         <el-table-column prop="safe_ivt_down" label="安全库存下限" width="150">
           <template slot-scope="scope">
             <el-input-number
@@ -106,7 +103,7 @@
           </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_time" label="设置时间" min-width="150" />
         <el-table-column prop="set_name" label="设置人" />
       </el-table>
       <!--分页组件-->
@@ -156,6 +153,7 @@ export default {
     return {
       stors: [],
       classes: [],
+      checkrows: [],
       class_idStr: null,
       materOpt_code: '23',
       stor_id: '',
@@ -212,13 +210,14 @@ export default {
       }
     },
     save() {
-      // if (this.stor_id === '') {
+      this.checkrows = this.$refs.table.selection
-      //   this.crud.notify('请选择仓库', CRUD.NOTIFICATION_TYPE.INFO)
+      if (this.checkrows.length === 0) {
-      //   return
+        this.crud.notify('请勾选需要保存的记录！')
-      // }
+        return false
+      }
       const data = {}
       data.stor_id = '1473162033548627968'
-      data.rows = this.crud.selections
+      data.rows = this.checkrows
       crudMaterialsafeivt.insertSafeBj(data).then(() => {
         this.crud.dleChangePage(1)
         this.crud.editSuccessNotify()