diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java index edeec565..e79083b8 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java @@ -31,7 +31,7 @@ public class RemoteSapFallbackFactory implements FallbackFactory sapRouterSync() { - return null; + return R.fail("SAP服务同步工艺失败:" + throwable.getMessage()); } @Override diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index e1019632..6463d76c 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -42,10 +42,10 @@ public class QuaController { if (qcProCheck.getIsqua()=="1"){ System.out.println("调用wcs接口开发转移"); -// WCSDTO wcsdto = new WCSDTO(); -// wcsdto.setFactory(qcProCheck.getFactoryCode()); -// wcsdto.setRfidNo(qcProCheck.getRfid()); -// remoteMesService.requestDestinationStations(wcsdto); + WCSDTO wcsdto = new WCSDTO(); + wcsdto.setFactory(qcProCheck.getFactoryCode()); + wcsdto.setRfidNo(qcProCheck.getRfid()); + remoteMesService.requestDestinationStations(wcsdto); return R.ok(); } else{ diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapRouterServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapRouterServiceImpl.java index 4901bf8b..00c2707d 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapRouterServiceImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapRouterServiceImpl.java @@ -179,9 +179,6 @@ public class SapRouterServiceImpl implements SapRouterService { sapProRoute.setRouteVersion("1.0"); sapProRouteMapper.insertProRoute(sapProRoute); - - - //增加工艺路线和工序的关系 SapProRouteProcess sapProRouteProcess=new SapProRouteProcess(); sapProRouteProcess.setRecordId(IdUtils.fastSimpleUUID()); diff --git a/op-modules/op-sap/src/main/resources/mapper/SapBaseProductMapper.xml b/op-modules/op-sap/src/main/resources/mapper/SapBaseProductMapper.xml deleted file mode 100644 index 9c41bc73..00000000 --- a/op-modules/op-sap/src/main/resources/mapper/SapBaseProductMapper.xml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select product_id, product_code, product_desc_zh, product_model,product_desc_en, rule_code, old_product_code, parts_product_code, sku_barcode, length, width, height, gross_weight, net_weight, tare_weight, volume, unit_price, product_group, product_group_name, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, create_by, create_time, update_by, update_time, factory_code, active_flag, sync_flag, primary_uom, del_flag, bstme, basic_order, conv_order, ausme, basic_issue, conv_issue, append_flag, append_percent from base_product - - - - - - - - - insert into base_product - - product_id, - product_code, - product_desc_zh, - product_model, - product_desc_en, - rule_code, - old_product_code, - parts_product_code, - sku_barcode, - length, - width, - height, - gross_weight, - net_weight, - tare_weight, - volume, - unit_price, - product_group, - product_group_name, - user_defined1, - user_defined2, - user_defined3, - user_defined4, - user_defined5, - user_defined6, - create_by, - create_time, - update_by, - update_time, - factory_code, - active_flag, - sync_flag, - primary_uom, - del_flag, - bstme, - basic_order, - conv_order, - ausme, - basic_issue, - conv_issue, - append_flag, - append_percent, - - - #{productId}, - #{productCode}, - #{productDescZh}, - #{productModel}, - #{productDescEn}, - #{ruleCode}, - #{oldProductCode}, - #{partsProductCode}, - #{skuBarcode}, - #{length}, - #{width}, - #{height}, - #{grossWeight}, - #{netWeight}, - #{tareWeight}, - #{volume}, - #{unitPrice}, - #{productGroup}, - #{productGroupName}, - #{userDefined1}, - #{userDefined2}, - #{userDefined3}, - #{userDefined4}, - #{userDefined5}, - #{userDefined6}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{factoryCode}, - #{activeFlag}, - #{syncFlag}, - #{primaryUom}, - #{delFlag}, - #{bstme}, - #{basicOrder}, - #{convOrder}, - #{ausme}, - #{basicIssue}, - #{convIssue}, - #{appendFlag}, - #{appendPercent}, - - - - - update base_product - - product_code = #{productCode}, - product_desc_zh = #{productDescZh}, - product_model = #{productModel}, - product_desc_en = #{productDescEn}, - rule_code = #{ruleCode}, - old_product_code = #{oldProductCode}, - parts_product_code = #{partsProductCode}, - sku_barcode = #{skuBarcode}, - length = #{length}, - width = #{width}, - height = #{height}, - gross_weight = #{grossWeight}, - net_weight = #{netWeight}, - tare_weight = #{tareWeight}, - volume = #{volume}, - unit_price = #{unitPrice}, - product_group = #{productGroup}, - product_group_name = #{productGroupName}, - user_defined1 = #{userDefined1}, - user_defined2 = #{userDefined2}, - user_defined3 = #{userDefined3}, - user_defined4 = #{userDefined4}, - user_defined5 = #{userDefined5}, - user_defined6 = #{userDefined6}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - factory_code = #{factoryCode}, - active_flag = #{activeFlag}, - sync_flag = #{syncFlag}, - primary_uom = #{primaryUom}, - del_flag = #{delFlag}, - bstme = #{bstme}, - basic_order = #{basicOrder}, - conv_order = #{convOrder}, - ausme = #{ausme}, - basic_issue = #{basicIssue}, - conv_issue = #{convIssue}, - append_flag = #{appendFlag}, - append_percent = #{appendPercent}, - - where product_id = #{productId} - - - - delete from base_product where product_id = #{productId} - - - - delete from base_product where product_id in - - #{productId} - - - - - diff --git a/op-modules/op-sap/src/main/resources/mapper/SapProProcessContentMapper.xml b/op-modules/op-sap/src/main/resources/mapper/SapProProcessContentMapper.xml deleted file mode 100644 index aba63e58..00000000 --- a/op-modules/op-sap/src/main/resources/mapper/SapProProcessContentMapper.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - select content_id, process_id, order_num, content_text, device, material, doc_url, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_process_content - - - - - - - - insert into pro_process_content - - content_id, - process_id, - order_num, - content_text, - device, - material, - doc_url, - remark, - attr1, - attr2, - attr3, - attr4, - create_by, - create_time, - update_by, - update_time, - - - #{contentId}, - #{processId}, - #{orderNum}, - #{contentText}, - #{device}, - #{material}, - #{docUrl}, - #{remark}, - #{attr1}, - #{attr2}, - #{attr3}, - #{attr4}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update pro_process_content - - process_id = #{processId}, - order_num = #{orderNum}, - content_text = #{contentText}, - device = #{device}, - material = #{material}, - doc_url = #{docUrl}, - remark = #{remark}, - attr1 = #{attr1}, - attr2 = #{attr2}, - attr3 = #{attr3}, - attr4 = #{attr4}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where content_id = #{contentId} - - - - delete from pro_process_content where content_id = #{contentId} - - - - delete from pro_process_content where content_id in - - #{contentId} - - - diff --git a/op-modules/op-sap/src/main/resources/mapper/SapProProcessMapper.xml b/op-modules/op-sap/src/main/resources/mapper/SapProProcessMapper.xml deleted file mode 100644 index 073783b5..00000000 --- a/op-modules/op-sap/src/main/resources/mapper/SapProProcessMapper.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select process_id, process_code, process_name, attention, - enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, - update_by, update_time,split_merge,split_merg_num,sync,work_center,work_time,equipment - from pro_process - - - - - - - - - - - - - - insert into pro_process - - process_id, - process_code, - process_name, - attention, - enable_flag, - remark, - attr1, - attr2, - attr3, - attr4, - create_by, - create_time, - update_by, - update_time, - split_merge, - split_merg_num, - sync, - work_center, - work_time, - equipment, - - - #{processId}, - #{processCode}, - #{processName}, - #{attention}, - #{enableFlag}, - #{remark}, - #{attr1}, - #{attr2}, - #{attr3}, - #{attr4}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{splitMerge}, - #{splitMergNum}, - #{sync}, - #{workCenter}, - #{workTime}, - #{equipment}, - - - - update pro_process - - process_code = #{processCode}, - process_name = #{processName}, - attention = #{attention}, - enable_flag = #{enableFlag}, - remark = #{remark}, - attr1 = #{attr1}, - attr2 = #{attr2}, - attr3 = #{attr3}, - attr4 = #{attr4}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - split_merge = #{splitMerge}, - split_merg_num = #{splitMergNum}, - sync = #{sync}, - work_center = #{workCenter}, - work_time = #{workTime}, - equipment = #{equipment}, - - where process_id = #{processId} - - - - delete from pro_process where process_id = #{processId} - - - - delete from pro_process where process_id in - - #{processId} - - - diff --git a/op-modules/op-sap/src/main/resources/mapper/SapProRouteMapper.xml b/op-modules/op-sap/src/main/resources/mapper/SapProRouteMapper.xml deleted file mode 100644 index 2da47d31..00000000 --- a/op-modules/op-sap/src/main/resources/mapper/SapProRouteMapper.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - select route_id, route_code, route_name, route_desc, enable_flag, remark, - attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, - route_version,need_check - from pro_route - - - - - - - - - - - - - - - insert into pro_route - - route_id, - route_code, - route_name, - route_desc, - enable_flag, - remark, - attr1, - attr2, - attr3, - attr4, - create_by, - create_time, - update_by, - update_time, - route_version, - need_check, - - - - #{routeId}, - #{routeCode}, - #{routeName}, - #{routeDesc}, - #{enableFlag}, - #{remark}, - #{attr1}, - #{attr2}, - #{attr3}, - #{attr4}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{routeVersion}, - #{needCheck}, - - - - - - update pro_route - - route_code = #{routeCode}, - route_name = #{routeName}, - route_desc = #{routeDesc}, - enable_flag = #{enableFlag}, - remark = #{remark}, - attr1 = #{attr1}, - attr2 = #{attr2}, - attr3 = #{attr3}, - attr4 = #{attr4}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - route_version = #{routeVersion}, - #{needCheck}, - - where route_id = #{routeId} - - - - delete from pro_route where route_id = #{routeId} - - - - delete from pro_route where route_id in - - #{routeId} - - - diff --git a/op-modules/op-sap/src/main/resources/mapper/SapProRouteProcessMapper.xml b/op-modules/op-sap/src/main/resources/mapper/SapProRouteProcessMapper.xml deleted file mode 100644 index 593cd25d..00000000 --- a/op-modules/op-sap/src/main/resources/mapper/SapProRouteProcessMapper.xml +++ /dev/null @@ -1,231 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select record_id, route_id, process_id, process_code, process_name, order_num, next_process_id, next_process_code, next_process_name, link_type, default_pre_time, default_suf_time, color_code,key_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_route_process - - - - - - - - - - - - - - - - - - - insert into pro_route_process - - record_id, - route_id, - process_id, - process_code, - process_name, - order_num, - next_process_id, - next_process_code, - next_process_name, - link_type, - default_pre_time, - default_suf_time, - color_code, - key_flag, - remark, - attr1, - attr2, - attr3, - attr4, - create_by, - create_time, - update_by, - update_time, - - - #{recordId}, - #{routeId}, - #{processId}, - #{processCode}, - #{processName}, - #{orderNum}, - #{nextProcessId}, - #{nextProcessCode}, - #{nextProcessName}, - #{linkType}, - #{defaultPreTime}, - #{defaultSufTime}, - #{colorCode}, - #{keyFlag}, - #{remark}, - #{attr1}, - #{attr2}, - #{attr3}, - #{attr4}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update pro_route_process - - route_id = #{routeId}, - process_id = #{processId}, - process_code = #{processCode}, - process_name = #{processName}, - order_num = #{orderNum}, - next_process_id = #{nextProcessId}, - next_process_code = #{nextProcessCode}, - next_process_name = #{nextProcessName}, - link_type = #{linkType}, - default_pre_time = #{defaultPreTime}, - default_suf_time = #{defaultSufTime}, - key_flag = #{keyFlag}, - color_code = #{colorCode}, - remark = #{remark}, - attr1 = #{attr1}, - attr2 = #{attr2}, - attr3 = #{attr3}, - attr4 = #{attr4}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where record_id = #{recordId} - - - - delete from pro_route_process where record_id = #{recordId} - - - - delete from pro_route_process where record_id in - - #{recordId} - - - - delete from pro_route_process where route_id = #{routeId} - - diff --git a/op-modules/op-sap/src/main/resources/mapper/SapProRouteProductMapper.xml b/op-modules/op-sap/src/main/resources/mapper/SapProRouteProductMapper.xml deleted file mode 100644 index b9ab5942..00000000 --- a/op-modules/op-sap/src/main/resources/mapper/SapProRouteProductMapper.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - select record_id, route_id, item_id, item_code, item_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_route_product - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into pro_route_product - - record_id, - route_id, - item_id, - item_code, - item_name, - remark, - attr1, - attr2, - attr3, - attr4, - create_by, - create_time, - update_by, - update_time, - - - #{recordId}, - #{routeId}, - #{itemId}, - #{itemCode}, - #{itemName}, - #{remark}, - #{attr1}, - #{attr2}, - #{attr3}, - #{attr4}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update pro_route_product - - route_id = #{routeId}, - item_id = #{itemId}, - item_code = #{itemCode}, - item_name = #{itemName}, - remark = #{remark}, - attr1 = #{attr1}, - attr2 = #{attr2}, - attr3 = #{attr3}, - attr4 = #{attr4}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where record_id = #{recordId} - - - - delete from pro_route_product where record_id = #{recordId} - - - - delete from pro_route_product where record_id in - - #{recordId} - - - - delete from pro_route_product where route_id = #{routeId} - - diff --git a/op-modules/op-sap/src/main/resources/mapper/SapSysUserMapper.xml b/op-modules/op-sap/src/main/resources/mapper/SapSysUserMapper.xml deleted file mode 100644 index fb3f086a..00000000 --- a/op-modules/op-sap/src/main/resources/mapper/SapSysUserMapper.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - diff --git a/op-modules/op-technology/src/main/resources/mapper/technology/ProRouteMapper.xml b/op-modules/op-technology/src/main/resources/mapper/technology/ProRouteMapper.xml index 6016d079..93a6f1f9 100644 --- a/op-modules/op-technology/src/main/resources/mapper/technology/ProRouteMapper.xml +++ b/op-modules/op-technology/src/main/resources/mapper/technology/ProRouteMapper.xml @@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, route_version, need_check, - -- 新增 + tec_man, tec_machine, tec_other, @@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{routeVersion}, #{needCheck}, - -- 新增 + #{tecMan}, #{tecMachine}, #{tecOther}, @@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, route_version = #{routeVersion}, need_check=#{needCheck}, - -- 新增 + tec_man = #{tecMan}, tec_machine = #{tecMachine}, tec_other = #{tecOther},