add:增加出库原数据存储

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java

@@ -3,6 +3,8 @@ package org.nl.wms.pda_manage.iostorage.sevice;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializeConfig;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.kingdee.bos.webapi.entity.IdentifyInfo;
 import com.kingdee.bos.webapi.sdk.K3CloudApi;
@@ -139,8 +141,9 @@ public class PdaIOService {
             ivtDtl.setSource_form_id(dtl.getId());
             ivtDtl.setSource_form_type(dtl.getForm_type());
             合并主表明细数据:{
-                JSONObject sourceFormData = (JSONObject) JSONObject.toJSON(mstString);
+                JSONObject sourceFormData = JSONObject.parseObject(mstString);
-                JSONObject dtlJ = (JSONObject) JSONObject.toJSON(dtl);
+                String dtlStr = JSON.toJSONString(dtl);
+                JSONObject dtlJ = JSONObject.parseObject(dtlStr);
                 dtlJ.putAll((Map) dtlJ.remove("form_data"));
                 sourceFormData.putAll(dtlJ);
                 ivtDtl.setSource_form_data(sourceFormData);

wms_pro/qd/src/views/wms/stor_manage/out/TaskDialog.vue

@@ -26,8 +26,9 @@
         <el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 150px" />
       </el-form-item>
       <el-form-item label="业务类型" prop="status">
-        <el-select disabled
+        <el-select
           v-model="form.bill_type"
+          disabled
           style="width: 100px; height: 35px;top: -5px;"
           placeholder="业务类型"
         >
@@ -99,8 +100,8 @@
         style="width: 100%;"
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
         :highlight-current-row="true"
-        @current-change="handleCurrentDtl"
         border
+        @current-change="handleCurrentDtl"
       >
         <el-table-column type="index" label="序号" width="55" align="center" />
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
@@ -114,7 +115,8 @@
         <el-table-column show-overflow-tooltip prop="vehicle_code" label="载具编码" width="160" />
         <el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" />
         <el-table-column show-overflow-tooltip prop="source_form_type" label="源单id" />
-        <el-table-column width="130" show-overflow-tooltip  v-for="(item, index) in dtlCols" :key="item.value"  :label="item.lable" >
+        <el-table-column show-overflow-tooltip prop="source_form_data" label="源单数据" />
+        <el-table-column v-for="(item, index) in dtlCols" :key="item.value" width="130" show-overflow-tooltip :label="item.lable">
           <template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
         </el-table-column>
         <el-table-column show-overflow-tooltip prop="remark" label="备注" />
@@ -160,7 +162,6 @@ import CRUD, { crud } from '@crud/crud'
 import crudProductout from '@/views/wms/stor_manage/out/storinvout'
 import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
 
-
 export default {
   name: 'TaskDialog',
   components: { },
@@ -238,9 +239,9 @@ export default {
     handleCurrentDtl(row) {
       this.currentDtl = row
       if (this.currentDtl.struct_code != null) {
-        this.divflag = false;
+        this.divflag = false
       } else {
-        this.divflag = true;
+        this.divflag = true
       }
       this.divdis(row)
     },
@@ -293,7 +294,6 @@ export default {
       this.form.dtl_row = row
       this.form.storage_qty = this.form.dtl_row.plan_qty
       crudProductout.getVehicleTask({ 'iostorinv_id': row.iostorinv_id, 'iostorinvdtl_id': row.iostorinvdtl_id }).then(res => {
-
         if (res.length !== 0) {
           this.form.tableMater = res
         }
@@ -457,7 +457,6 @@ export default {
       }
     },
     sectQueryChange(val) {
-
       this.sectProp = val
       if (val.length === 1) {
         this.id = val[0]

wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue

@@ -98,7 +98,8 @@
         <el-table-column prop="struct_code" label="分配仓位" align="center" />
         <el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" align="center" />
         <el-table-column show-overflow-tooltip prop="source_form_id" label="源单号" align="center" />
-        <el-table-column show-overflow-tooltip width="150" v-for="(item, index) in dtlCols" :key="item.value"  :label="item.lable" >
+        <el-table-column show-overflow-tooltip prop="source_form_data" label="源单数据" align="center" />
+        <el-table-column v-for="(item, index) in dtlCols" :key="item.value" show-overflow-tooltip width="150" :label="item.lable">
           <template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
         </el-table-column>
         <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />