diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java index 2daa1089..b602c60d 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/InterationUtil.java +++ b/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) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java index 14ad6d85..423e2e10 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java +++ b/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() .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() .eq("vehicle_code", task.getVehicle_code())); if (!StringUtils.isEmpty(vehicleMater.getProc_inst_id())){ diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/external_system/acs/service/WmsToAcsService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/external_system/acs/service/WmsToAcsService.java index 6c287d31..ea27267a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/external_system/acs/service/WmsToAcsService.java +++ b/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; } } diff --git a/wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue b/wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue index a4ca1c74..2ac9f13d 100644 --- a/wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue +++ b/wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue @@ -159,6 +159,13 @@ + + + + + + + @@ -195,6 +202,7 @@ + @@ -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,