rev:修改链条接口

wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java

@@ -31,7 +31,7 @@ public class InterationUtil {
         if (STATUS_FLASE.equals(isConnect)) {
             return TableDataInfo.build();
         }
-        String acsUrl = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("acs_url").getValue();
+        String acsUrl = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("wcs_url").getValue();
         String url = acsUrl + api;
         try {
             String resultMsg = HttpRequest.post(url)

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java

@@ -115,7 +115,7 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
         this.update(new UpdateWrapper<SchBaseTask>()
                 .set("status",param.getString("status"))
                 .eq("task_code", task_code));
-        if (param.getString("method_name").equals(StatusEnum.FORM_STATUS.code("完成"))){
+        if (param.getString("status").equals(StatusEnum.FORM_STATUS.code("完成"))){
             MdPbVehicleMater vehicleMater = iMdPbVehicleMaterService.getOne(new QueryWrapper<MdPbVehicleMater>()
                     .eq("vehicle_code", task.getVehicle_code()));
             if (!StringUtils.isEmpty(vehicleMater.getProc_inst_id())){

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/external_system/acs/service/WmsToAcsService.java

@@ -43,7 +43,7 @@ public class WmsToAcsService implements InitializingBean {
                 .type(type)
                 .data(arr).build();
 
-        TableDataInfo tableDataInfo = InterationUtil.notifyExt(mapping.getSync_url(), (JSONObject) JSON.toJSON(dto));
+        TableDataInfo tableDataInfo = InterationUtil.notifyExt("/api/wmsToAcs/apply", (JSONObject) JSON.toJSON(dto));
         return tableDataInfo;
     }
 }

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

@@ -159,6 +159,13 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="载具编码" prop="vehicle_code">
+                <el-input v-model="form.vehicle_code" style="width: 150px;"/>
+              </el-form-item>
+            </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-form-item>
@@ -195,6 +202,7 @@
         <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="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="更新时间"/>
         <el-table-column prop="update_name" show-overflow-tooltip width="150" label="更新人"/>
@@ -248,6 +256,7 @@ const defaultForm = {
   material_id: null,
   qty: null,
   pcsn: null,
+  vehicle_code: null,
   form_param: null,
   has_child: false,
   is_base: false,