rev:修改dtlSplit判断

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

@@ -24,7 +24,9 @@ public class DictConstantPool {
             ,"biz_status","业务单据状态"
             ,"biz_form_type","业务单据类型"
             ,"material_id","物料id"
-            ,"qty","数量"
+            ,"qty","申请数量"
+            ,"plan_qty","计划数量"
+            ,"assign_qty","已领数量"
             ,"unit_id","单位"
             ,"pcsn","批次"
             ,"vehicle_code","载具");

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

@@ -98,10 +98,18 @@ public class BmFormStruc implements Serializable {
     private String vehicle_id;
 
     /**
-     * 数量
+     * 申请数量（必须有）
      */
     private String qty;
+    /**
+     * 计划数量
+     */
+    private String plan_qty;
 
+    /**
+     * 已领取数量
+     */
+    private String assign_qty;
     /**
      * 单位id
      */

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

@@ -7,6 +7,7 @@ import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import org.nl.common.domain.entity.PageQuery;
 import org.nl.common.enums.StatusEnum;
+import org.nl.common.utils.MapOf;
 import org.nl.wms.config_manage.form_struc.service.IBmFormStrucService;
 import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc;
 import org.nl.wms.flow_manage.flow.service.execution.IActRuExecutionService;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -49,13 +51,13 @@ public class PdaOutController {
     @GetMapping("order")
     @Log("出库单据列表")
     @SaIgnore
-    public ResponseEntity<List<LabelValueVo>> orderType() {
+    public ResponseEntity<List<Map>> orderType() {
-        List<LabelValueVo> result = new ArrayList<>();
+        List<Map> result = new ArrayList<>();
         List<BmFormStruc> list = iBmFormStrucService.list(new QueryWrapper<BmFormStruc>()
                 .likeRight("form_desc","出库")
                 .select("form_type","form_name"));
         for (BmFormStruc formStruc : list) {
-            result.add(new LabelValueVo(formStruc.getForm_name(), formStruc.getForm_type()));
+            result.add(MapOf.of("text",formStruc.getForm_name(),"value",formStruc.getForm_type()));
         }
         return new ResponseEntity<>(result,HttpStatus.OK);
     }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java

@@ -37,8 +37,6 @@ public class PmFormDataController {
     @GetMapping()
     @Log("查询数据")
     public ResponseEntity<Object> queryAll(FormDataQuery query, PageQuery page) {
-
-
         return new ResponseEntity<>(TableDataInfo.build(iPmFormDataService.queryTree(query,page)), HttpStatus.OK);
     }
 

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

@@ -78,7 +78,11 @@ public class PmFormData implements Serializable {
      */
     private BigDecimal qty;
     /**
-     * 分配数量
+     * 数量
+     */
+    private BigDecimal plan_qty;
+    /**
+     * 已分配数量
      */
     private BigDecimal assign_qty;
 

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

@@ -36,6 +36,8 @@
         <result  property="create_time" column="create_time"/>
         <result  property="material_id" column="material_id"/>
         <result  property="qty" column="qty"/>
+        <result  property="assign_qty" column="assign_qty"/>
+        <result  property="plan_qty" column="plan_qty"/>
         <result  property="pcsn" column="pcsn"/>
         <result  property="material_code" column="material_code"/>
         <result  property="material_name" column="material_name"/>

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

@@ -104,7 +104,11 @@ public class PmFormDataDto implements Serializable {
      */
     private BigDecimal qty;
     /**
-     * 分配数量
+     * 数量
+     */
+    private BigDecimal plan_qty;
+    /**
+     * 已分配数量
      */
     private BigDecimal assign_qty;
 

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

@@ -128,7 +128,6 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
                 }
             }
         }
-
         return result;
     }
 
@@ -232,7 +231,7 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
             formMap.put(item.getString("value"), item);
         }, HashMap::putAll);
         //基础字段
-        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.getVehicle_id(),formStruc.getUnit_id(), formStruc.getQty());
+        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.getVehicle_id(),formStruc.getUnit_id(), formStruc.getQty(),formStruc.getPlan_qty(),formStruc.getAssign_qty());
         JSONObject data = fieldMapping(fields, fieldMapping, sourceData);
         data.put("form_type",formStruc.getForm_type());
 

wms_pro/qd/src/views/login.vue

@@ -2,7 +2,7 @@
   <div class="login" :style="'background-image:url('+ Background +');'">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
-        恒森WMS系统
+        仓库综合管理平台
       </h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">

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

@@ -19,21 +19,21 @@
               filterable
               size="mini"
               class="filter-item"
-              style="width: 185px;">
+              style="width: 185px;"
+            >
               <el-option
                 v-for="item in form_types"
                 :key="item.value"
                 :label="item.label"
-                :value="item.value">
+                :value="item.value"
-              </el-option>
+              />
             </el-select>
           </el-form-item>
           <rrOperation :crud="crud" />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
+      <crudOperation :permission="permission" />
-      </crudOperation>
       <!--表单组件-->
       <el-dialog
         :close-on-click-modal="false"
@@ -58,14 +58,14 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label="表单描述" prop="form_desc">
-                <el-input type="textarea" v-model="form.form_desc" style="width: 430px;"/>
+                <el-input v-model="form.form_desc" type="textarea" style="width: 430px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
               <el-form-item label="数据映射字段" prop="convert_json">
-                <el-input type="textarea" v-model="form.convert_json" style="width: 430px;"/>
+                <el-input v-model="form.convert_json" type="textarea" style="width: 430px;" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -90,8 +90,8 @@
             <el-col :span="12">
               <el-form-item label="是否含有子表" prop="has_child">
                 <el-radio-group v-model="form.has_child" style="width: 140px">
-                  <el-radio :label='true'>是</el-radio>
+                  <el-radio :label="true">是</el-radio>
-                  <el-radio :label='false'>否</el-radio>
+                  <el-radio :label="false">否</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -100,8 +100,8 @@
             <el-col :span="12">
               <el-form-item label="是否基础表" prop="has_child">
                 <el-radio-group v-model="form.is_base" style="width: 140px">
-                  <el-radio :label='true'>是</el-radio>
+                  <el-radio :label="true">是</el-radio>
-                  <el-radio :label='false'>否</el-radio>
+                  <el-radio :label="false">否</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -142,11 +142,23 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="物料数量映射" prop="qty">
+              <el-form-item label="物料需求数量" prop="qty">
                 <el-input v-model="form.qty" style="width: 150px;" />
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="计划数量" prop="material_id">
+                <el-input v-model="form.plan_qty" style="width: 150px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="已分配数量" prop="qty">
+                <el-input v-model="form.assign_qty" style="width: 150px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="物料单位" prop="pcsn">
@@ -167,7 +179,7 @@
             </el-col>
           </el-row>
           <el-form-item label="自定义字段" prop="form_param">
-            <el-input type="textarea" v-model="form.form_param" :formatter="jsonFormat" style="width: 430px;"/>
+            <el-input v-model="form.form_param" type="textarea" :formatter="jsonFormat" style="width: 430px;" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -200,8 +212,10 @@
         <el-table-column prop="biz_date" show-overflow-tooltip width="130" label="业务单据时间映射" />
         <el-table-column prop="biz_status" show-overflow-tooltip width="130" label="业务单据状态映射" />
         <el-table-column prop="material_id" show-overflow-tooltip width="120" label="物料id映射" />
-        <el-table-column prop="qty" show-overflow-tooltip width="120" label="物料数量映射"/>
+        <el-table-column prop="qty" show-overflow-tooltip width="120" label="申请数量" />
-        <el-table-column prop="pcsn" show-overflow-tooltip width="120" label="物料批次映射"/>
+        <el-table-column prop="plan_qty" show-overflow-tooltip width="120" label="计划数量" />
+        <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="form_param" show-overflow-tooltip width="120" :formatter="jsonFormat" label="自定义字段映射" />
         <el-table-column prop="update_time" show-overflow-tooltip width="150" label="更新时间" />
@@ -255,6 +269,8 @@ const defaultForm = {
   biz_form_type: null,
   material_id: null,
   qty: null,
+  plan_qty: null,
+  assign_qty: null,
   pcsn: null,
   vehicle_code: null,
   form_param: null,
@@ -326,7 +342,7 @@ export default {
       }, 100)
     },
     booleanFormat(row, column, cellValue) {
-      return cellValue ? '是' : '否';
+      return cellValue ? '是' : '否'
     },
     jsonFormat(row, index) {
       if (row.form_param != null) {