add:单据同步

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

@@ -11,6 +11,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.nl.common.enums.StatusEnum;
 
 /**
  * <p>
@@ -62,7 +63,7 @@ public class PmFormData implements Serializable {
     /**
      * 业务单据状态
      */
-    private String status;
+    private String status = StatusEnum.FORM_STATUS.code("生成");
 
     /**
      * 创建id
@@ -83,6 +84,10 @@ public class PmFormData implements Serializable {
      * 数量
      */
     private BigDecimal qty;
+    /**
+     * 分配数量
+     */
+    private BigDecimal assign_qty;
 
     /**
      * 数量

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

@@ -112,7 +112,7 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
         //基础字段
         Set<String> fields = ListOf.ofSet(formStruc.getBiz_code(), formStruc.getBiz_id(), formStruc.getBiz_code(), formStruc.getBiz_status(), formStruc.getMaterial_id(), formStruc.getPcsn(), formStruc.getVehicle_code(), formStruc.getUnit_id(), formStruc.getQty());
         JSONObject data = fieldMapping(fields, fieldMapping, sourceData);
-
+        data.put("form_type",formStruc.getForm_type());
         JSONObject form_param = formStruc.getForm_param();
         if (form_param!=null){
             JSONObject form_data = fieldMapping(form_param.keySet(), fieldMapping, sourceData);

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java

@@ -89,10 +89,14 @@ public class SyncFormMappingController {
     public ResponseEntity<Object> syncAnalyse(@RequestBody JSONObject form){
         //参数判读，参数解析，调用参数入库
         Object analyseData = form.remove("analyseData");
+        Object needSave = form.remove("needSave");
         if (analyseData == null){
             throw new BadRequestException("解析数据不能为空");
         }
         List<PmFormData> pmFormDatas = formDataService.syncAnalyse(form.toJavaObject(SyncFormMapping.class), (String) analyseData);
+        if (needSave!=null && (Boolean)needSave){
+            formDataService.saveBatch(pmFormDatas);
+        }
         return new ResponseEntity<>(TableDataInfo.build(pmFormDatas),HttpStatus.CREATED);
     }
 

wms_pro/qd/src/views/wms/base_manage/vehicle/index.vue

@@ -252,7 +252,9 @@
           </template>
         </el-table-column>
         <el-table-column prop="vehicle_name" label="载具名称" />
-        <el-table-column prop="vehicle_weight" label="载具单重(g)" />
+        <el-table-column prop="l" label="深度" />
+        <el-table-column prop="w" label="宽度" />
+        <el-table-column prop="h" label="高度" />
         <el-table-column label="是否启用" align="center" prop="is_used">
           <template slot-scope="scope">
             <el-switch

wms_pro/qd/src/views/wms/sync_manage/form_mapping/index.vue

@@ -136,9 +136,22 @@
         @close="syncAnalyseCannel"
       >
         <el-form ref="form" :model="syncForm" :rules="rules" size="mini" label-width="50px">
-          <el-form-item  label="表单:" prop="occupystruct_qty">
+          <el-row :gutter="40" class="panel-group">
-            <el-input disabled v-model="syncForm.form_name" :precision="0" style="width: 150px;" />
+            <el-col :span="11">
-          </el-form-item>
+              <el-form-item  label="表单:" prop="occupystruct_qty">
+                <el-input disabled v-model="syncForm.form_name" :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-switch>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-form-item  label="测试数据" prop="analyseData">
             <el-input type="textarea" v-model="syncForm.analyseData" :precision="0" style="width: 650px;" />
           </el-form-item>