add:增加合格证入库功能。

wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/constant/DictConstantPool.java

@@ -27,6 +27,7 @@ public class DictConstantPool {
             ,"qty","申请数量"
             ,"plan_qty","计划数量"
             ,"assign_qty","已领数量"
+            ,"bar_code","条码"
             ,"unit_id","单位"
             ,"pcsn","批次"
             ,"vehicle_code","载具");

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java

@@ -143,6 +143,10 @@ public class BmFormStruc implements Serializable {
      * 是否属于基础表单
      */
     private Boolean is_base;
+    /**
+     * 条码
+     */
+    private String bar_code;
 
 
 }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/BmFormStrucDto.java

@@ -97,6 +97,16 @@ public class BmFormStrucDto implements Serializable {
      */
     private String qty;
 
+    /**
+     * 计划数量
+     */
+    private String plan_qty;
+
+    /**
+     * 已领取数量
+     */
+    private String assign_qty;
+
     /**
      * 单位id
      */
@@ -121,6 +131,10 @@ public class BmFormStrucDto implements Serializable {
      * 是否为基础表
      */
     private Boolean is_base;
+    /**
+     * 是否为基础表
+     */
+    private String bar_code;
     /**
      * 表单自动映射
      */

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

@@ -125,7 +125,7 @@ public class PdaIOService {
     public PmFormData getCertificateInfo(String id) {
         PmFormData result = new PmFormData();
         try {
-            if (id.contains("OP")) {
+            if (id.contains("OP")||id.contains("op")) {
                 getOpBills(id, result);
             } else {
 
@@ -164,7 +164,7 @@ public class PdaIOService {
                 result.setOwnerId(dataList.get(7).toString());
                 result.setPcsn(dataList.get(8).toString());
                 result.setProduct_area(dataList.get(9).toString());
-                result.setStockInOrgId(dataList.get(10).toString());
+                //result.setStockId(dataList.get(10).toString());
             }
         }
     }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java

@@ -178,10 +178,16 @@ public class PmFormData implements Serializable {
     private String product_area;
 
     /**
-     * 生产车间
+     * ERP仓库
      */
     @TableField(exist = false)
-    private String stockInOrgId;
+    private String stockId;
+
+    /**
+     * 条码
+     */
+    private String bar_code;
+
 
 
 }

wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue

@@ -177,6 +177,11 @@
                 <el-input v-model="form.vehicle_code" style="width: 150px;" />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="条码" prop="bar_code">
+                <el-input v-model="form.bar_code" style="width: 150px;" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-form-item label="自定义字段" prop="form_param">
             <el-input v-model="form.form_param" type="textarea" :formatter="jsonFormat" style="width: 430px;" />
@@ -217,6 +222,7 @@
         <el-table-column prop="assign_qty" show-overflow-tooltip width="120" label="已分配数量" />
         <el-table-column prop="pcsn" show-overflow-tooltip width="120" label="批次" />
         <el-table-column prop="vehicle_code" show-overflow-tooltip width="120" label="载具编号" />
+        <el-table-column prop="bar_code" show-overflow-tooltip width="120" label="条码" />
         <el-table-column prop="form_param" show-overflow-tooltip width="120" :formatter="jsonFormat" label="自定义字段映射" />
         <el-table-column prop="update_time" show-overflow-tooltip width="150" label="更新时间" />
         <el-table-column prop="update_name" show-overflow-tooltip width="150" label="更新人" />
@@ -271,6 +277,7 @@ const defaultForm = {
   qty: null,
   plan_qty: null,
   assign_qty: null,
+  bar_code: null,
   pcsn: null,
   vehicle_code: null,
   form_param: null,