From 2cc254ba280a403ed69a92f5cf3ef3ed98ad0ff3 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 4 Dec 2024 22:40:59 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PmFormDataController.java      |  17 +++
 .../dao/mapper/xml/StIvtStructattrMapper.xml  |   3 +
 .../wms/pm_manage/feedback_data/index.vue     |  90 +++++++++++++++
 .../views/wms/pm_manage/form_data/index.vue   |  18 +++
 .../views/wms/stor_manage/out/AddDialog.vue   |   1 +
 .../wms/stor_manage/storIvtInfo/index.vue     |  20 +++-
 .../wms/sync_manage/form_mapping/index.vue    | 104 +++++++++++++++++-
 7 files changed, 246 insertions(+), 7 deletions(-)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java
index a438b911..18992aba 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java
@@ -2,10 +2,16 @@ package org.nl.wms.pm_manage.form_data.controller;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import org.nl.common.domain.entity.PageQuery;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc;
 import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
 import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
 import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
@@ -39,6 +45,17 @@ public class PmFormDataController {
     public ResponseEntity<Object> queryAll(FormDataQuery query, PageQuery page) {
         return new ResponseEntity<>(TableDataInfo.build(iPmFormDataService.queryTree(query,page)), HttpStatus.OK);
     }
+    @PutMapping()
+    @Log("修改单据结构")
+    public ResponseEntity<Object> update(@RequestBody JSONObject param){
+        //逻辑判断：如果有数据了则不允许修改
+        String s = param.toString(SerializerFeature.SortField);
+        PmFormData pmFormData = JSONObject.parseObject(s, PmFormData.class, Feature.OrderedField);
+        pmFormData.setUpdate_name(SecurityUtils.getCurrentUserId());
+        pmFormData.setUpdate_time(DateUtil.now());
+        iPmFormDataService.updateById(pmFormData);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 
     @DeleteMapping
     @Transactional
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml
index 7cad777c..33993124 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml
@@ -136,6 +136,9 @@
             <if test="query.vehicle_code != null and query.vehicle_code != ''">
                 and struct.vehicle_code LIKE '%${query.vehicle_code}%'
             </if>
+            <if test="query.stor_code != null and query.stor_code != ''">
+                and struct.stor_code = #{query.stor_code}
+            </if>
         </where>
     </select>
     <select id="getStructIvtAssign" resultType="org.nl.wms.stor_manage.struct.service.dao.StructAssignQty">
diff --git a/wms_pro/qd/src/views/wms/pm_manage/feedback_data/index.vue b/wms_pro/qd/src/views/wms/pm_manage/feedback_data/index.vue
index a7b5bbb4..82e3e793 100644
--- a/wms_pro/qd/src/views/wms/pm_manage/feedback_data/index.vue
+++ b/wms_pro/qd/src/views/wms/pm_manage/feedback_data/index.vue
@@ -28,6 +28,23 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.status"
+              size="mini"
+              placeholder="单据状态"
+              class="filter-item"
+              clearable
+              @change="crud.toQuery()"
+            >
+              <el-option
+                v-for="item in statusEnum.FORM_STATUS"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <template v-for="(col,index) in cols" v-if="hideShowDialog">
             <el-form-item label="col.lable">
               <label slot="label">{{ col.lable }}:</label>
@@ -52,6 +69,61 @@
         </el-button>
       </crudOperation>
 
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="600px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="表单类型" prop="form_type">
+                <el-input v-model="form.form_type" style="width: 150px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="实例" prop="proc_inst_id">
+                <el-input v-model="form.proc_inst_id" style="width: 150px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="源单id" prop="source_form_id">
+                <el-input v-model="form.source_form_id" style="width: 150px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="源单类型" prop="source_form_type">
+                <el-input v-model="form.source_form_type" style="width: 150px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="批号" prop="pcsn">
+                <el-input v-model="form.pcsn" style="width: 150px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="互传数据" prop="form_data">
+            <el-input v-model="form.form_data" type="textarea" :formatter="jsonFormat" style="width: 430px;" />
+          </el-form-item>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remark">
+                <el-input v-model="form.remark" type="textarea" style="width: 430px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
       <!--表格渲染-->
       <el-table
         ref="table"
@@ -161,6 +233,7 @@ export default {
   dicts: ['base_data'],
   components: { pagination, crudOperation, rrOperation, udOperation, ViewDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
+  statusEnums: [ 'FORM_STATUS' ],
   cruds() {
     return CRUD({
       title: '表单数据',
@@ -227,6 +300,23 @@ export default {
       }
       return false
     },
+    [CRUD.HOOK.beforeToEdit]() {
+      this.form.form_data = JSON.stringify(this.form.form_data)
+      return true
+    },
+    [CRUD.HOOK.beforeSubmit]() {
+      if (this.form.form_data) {
+        this.form.form_data = JSON.parse(this.form.form_data)
+      }
+      return true
+    },
+    jsonFormat(row, index) {
+      debugger
+      if (row.form_data != null) {
+        return JSON.stringify(row.form_data)
+      }
+      return ''
+    },
     getFromTypes() {
       crudFormData.getParentFormTypesByDesc('回传').then((res) => { // 获取分类名称，查询根据分类编码查找对应分支树
         this.fromTypes = res
diff --git a/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue b/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue
index 22c8e9cb..1cb892ee 100644
--- a/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue
+++ b/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue
@@ -28,6 +28,23 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.status"
+              size="mini"
+              placeholder="单据状态"
+              class="filter-item"
+              clearable
+              @change="crud.toQuery()"
+            >
+              <el-option
+                v-for="item in statusEnum.FORM_STATUS"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <template v-for="(col,index) in cols" v-if="hideShowDialog">
             <el-form-item label="col.lable">
               <label slot="label">{{ col.lable }}:</label>
@@ -181,6 +198,7 @@ export default {
   dicts: ['base_data'],
   components: { pagination, crudOperation, rrOperation, udOperation, ViewDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
+  statusEnums: [ 'FORM_STATUS' ],
   cruds() {
     return CRUD({
       title: '表单数据',
diff --git a/wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue
index 31432a62..248cb81a 100644
--- a/wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue
@@ -440,6 +440,7 @@ export default {
       this.form.source_form_type = mst.form_type
       this.form.source_form_code = mst.code
       this.form.source_form_id = mst.id
+      this.form.product_area = mst.form_data.product_area
       const mst_form_data = mst.form_data
       if (data['item'] == null || data['item'].length == 0) {
         rows.push(mst)
diff --git a/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue
index a4929416..c800784b 100644
--- a/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue
@@ -9,11 +9,26 @@
         label-width="80px"
         label-suffix=":"
       >
+        <el-form-item label="所属仓库">
+          <el-select
+            v-model="query.stor_code"
+            clearable
+            class="filter-item"
+            placeholder="所属仓库"
+            @change="crud.toQuery"
+          >
+            <el-option
+              v-for="item in tableEnum.st_ivt_bsrealstorattr"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="仓位信息">
           <el-input
             v-model="query.search"
             clearable
-            style="width: 300px"
             size="mini"
             placeholder="请输入仓位信息"
             prefix-icon="el-icon-search"
@@ -24,7 +39,6 @@
           <el-input
             v-model="query.vehicle_code"
             clearable
-            style="width: 300px"
             size="mini"
             placeholder="请输入载具编码"
             prefix-icon="el-icon-search"
@@ -157,7 +171,7 @@ export default {
   dicts: [],
   name: 'StructIvtInfo',
   components: {pagination, crudOperation, rrOperation, udOperation},
-  tableEnums: [ 'bm_measure_unit#unit_name#unit_id' ],
+  tableEnums: [ 'bm_measure_unit#unit_name#unit_id', 'st_ivt_bsrealstorattr#stor_name#stor_code' ],
   statusEnums: [ 'LOCK' ],
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
diff --git a/wms_pro/qd/src/views/wms/sync_manage/form_mapping/index.vue b/wms_pro/qd/src/views/wms/sync_manage/form_mapping/index.vue
index 26f81b53..2ad61224 100644
--- a/wms_pro/qd/src/views/wms/sync_manage/form_mapping/index.vue
+++ b/wms_pro/qd/src/views/wms/sync_manage/form_mapping/index.vue
@@ -42,13 +42,12 @@
         <el-button
           slot="left"
           class="filter-item"
-          :disabled="crud.selections.length !== 1"
           icon="el-icon-position"
           size="mini"
           type="primary"
-          @click="syncData(crud.selections[0])"
+          @click="syncErpbutton"
         >
-          同步
+          同步ERP
         </el-button>
         <el-button
           slot="left"
@@ -221,6 +220,99 @@
           <el-button :loading="crud.cu === 2" type="primary" @click="syncAnalyseSubmit">同步解析</el-button>
         </div>
       </el-dialog>
+      <el-dialog
+        :close-on-click-modal="false"
+        title="同步选择"
+        :visible.sync="syncErpShow"
+        width="800px"
+        @close="syncErp"
+      >
+        <el-form ref="form" :model="syncForm" :rules="rules" size="mini" label-width="50px">
+          <el-row :gutter="40" class="panel-group">
+            <el-col :span="11">
+              <el-form-item label="表单:" prop="occupystruct_qty">
+                <el-input v-model="syncForm.form_name" disabled :precision="0" style="width: 150px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item label="存储:" prop="needSave">
+                <el-switch
+                  v-model="syncForm.needSave"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="测试数据" prop="analyseData">
+            <el-input v-model="syncForm.analyseData" type="textarea" :precision="0" style="width: 650px;" />
+          </el-form-item>
+        </el-form>
+        <div v-if="viewMst.length >0">
+          <div class="crud-opts2">
+            <span class="role-span2">解析数据</span>
+          </div>
+          <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+            <!--表格渲染-->
+            <el-table
+              ref="table"
+              :data="viewMst"
+              style="width: 100%;"
+              max-height="300"
+              size="mini"
+              border
+              :highlight-current-row="true"
+              :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+            >
+              <el-table-column min-width="120" show-overflow-tooltip prop="id" label="id" align="center" />
+              <el-table-column min-width="120" show-overflow-tooltip prop="code" label="单据编码" align="center" />
+              <el-table-column min-width="120" show-overflow-tooltip prop="biz_code" label="业务单" align="center" />
+              <el-table-column min-width="120" show-overflow-tooltip prop="material_id" label="物料id" align="center" />
+              <el-table-column min-width="120" show-overflow-tooltip prop="pcsn" label="批次" align="center" />
+              <el-table-column min-width="120" show-overflow-tooltip prop="qty" label="数量" align="center" />
+              <el-table-column min-width="120" show-overflow-tooltip prop="unit_id" label="单位" align="center" />
+              <el-table-column min-width="120" show-overflow-tooltip prop="vehicle_code" label="载具" align="center" />
+              <el-table-column min-width="120" show-overflow-tooltip prop="status" label="单据状态" align="center" />
+              <el-table-column v-for="(item, index) in viewMstCols" :key="item.value" min-width="120" show-overflow-tooltip :label="item.lable">
+                <template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
+              </el-table-column>
+            </el-table>
+          </el-card>
+          <!--          <div v-if="hasDtl">-->
+          <!--            <div class="crud-opts2">-->
+          <!--              <span class="role-span2">明细数据</span>-->
+          <!--            </div>-->
+          <!--            <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">-->
+          <!--              &lt;!&ndash;表格渲染&ndash;&gt;-->
+          <!--              <el-table-->
+          <!--                ref="table"-->
+          <!--                :data="viewDtl"-->
+          <!--                style="width: 100%;"-->
+          <!--                max-height="300"-->
+          <!--                size="mini"-->
+          <!--                border-->
+          <!--                :highlight-current-row="true"-->
+          <!--                :header-cell-style="{background:'#f5f7fa',color:'#606266'}"-->
+          <!--              >-->
+          <!--                <el-table-column min-width="120" show-overflow-tooltip prop="id" label="id" align="center" />-->
+          <!--                <el-table-column min-width="120" show-overflow-tooltip prop="code" label="单据编码" align="center" />-->
+          <!--                <el-table-column min-width="120" show-overflow-tooltip prop="biz_code" label="业务单" align="center" />-->
+          <!--                <el-table-column min-width="120" show-overflow-tooltip prop="material_id" label="物料id" align="center" />-->
+          <!--                <el-table-column min-width="120" show-overflow-tooltip prop="pcsn" label="批次" align="center" />-->
+          <!--                <el-table-column min-width="120" show-overflow-tooltip prop="qty" label="数量" align="center" />-->
+          <!--                <el-table-column min-width="120" show-overflow-tooltip prop="vehicle_code" label="载具" align="center" />-->
+          <!--                <el-table-column min-width="120" show-overflow-tooltip prop="status" label="单据状态" align="center" />-->
+          <!--                <el-table-column min-width="120" show-overflow-tooltip v-for="(item, index) in viewDtlCols" :key="item.value"  :label="item.lable" >-->
+          <!--                  <template slot-scope="scope">{{scope.row.form_data[item.value]}}</template>-->
+          <!--                </el-table-column>-->
+          <!--              </el-table>-->
+          <!--            </el-card>-->
+          <!--          </div>-->
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button :loading="crud.cu === 2" type="primary" @click="syncAnalyseSubmit">同步解析</el-button>
+        </div>
+      </el-dialog>
       <!--表格渲染-->
       <el-table
         ref="table"
@@ -318,6 +410,7 @@ export default {
       dataTypeList: [],
       addShow: false,
       editShow: false,
+      syncErpShow: false,
       syncShow: false,
       syncForm: {},
       permission: {},
@@ -355,7 +448,10 @@ export default {
       this.$refs.editRef.setForm(row)
       this.editShow = true
     },
-    syncData(data) {
+    syncErpbutton(){
+      this.syncErpShow = true
+    },
+    syncErp(data) {
       crudFormMapping.syncData(data).then(() => {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
       })