diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java index 66918de16..74ee0ac5c 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java @@ -272,13 +272,6 @@ public class ThrSystemController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } - //todo 第三方单据类型还未完成 -// BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeService.finByLocalAction(basicThirdSysBusApiEntity.getCode()); -// if (bussinessOriginTypeResponse != null) { -// basicThirdSysBusApiEntity.setThirdBuyCode(bussinessOriginTypeResponse.getThirdAction()); -// basicThirdSysBusApiEntity.setThirdBuyName(bussinessOriginTypeResponse.getThirdName()); -// } - boolean result = thrSystemBusApiService.saveBusTypes(thrSystemBusApiEntity); if (result) { return ResultVOUtils.success(); diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml index 96adac443..5726b786a 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrSystemBusApiDao.xml @@ -2,25 +2,42 @@ - UPDATE thr_system_bus_api - code=#{code}, - `name`=#{name}, - `thirdBuyName`=#{thirdBuyName}, - `thirdBuyCode`=#{thirdBuyCode}, - thirdSys=#{thirdSys}, - url=#{url}, - `type`=#{type}, - remark=#{remark}, + + code=#{code}, + + + `name`=#{name}, + + + `thirdBuyName`=#{thirdBuyName}, + + + `thirdBuyCode`=#{thirdBuyCode}, + + + thirdSys=#{thirdSys}, + + + url=#{url}, + + + `type`=#{type}, + + + remark=#{remark}, + - WHERE id=#{id} + WHERE id = #{id} @@ -44,33 +58,29 @@ insert - ignore + ignore INTO thr_system_bus_api - (`code`, `name`, thirdBuyName, thirdBuyCode, `thirdSys`, url, `type`, remark) - values ( - #{code}, - #{name}, - #{thirdBuyName}, - #{thirdBuyCode}, - #{thirdSys}, - #{url}, - #{type}, - #{remark} - ) + (`code`, `name`, thirdBuyName, thirdBuyCode, `thirdSys`, url, `type`, remark) + values (#{code}, + #{name}, + #{thirdBuyName}, + #{thirdBuyCode}, + #{thirdSys}, + #{url}, + #{type}, + #{remark}) insert into thr_system_bus_api (code, `name`, thirdBuyName, thirdBuyCode, thirdSys, type) values - ( - #{item.code}, - #{item.name}, - #{item.thirdBuyName}, - #{item.thirdBuyCode}, - #{item.thirdSys}, - #{item.type} - ) + (#{item.code}, + #{item.name}, + #{item.thirdBuyName}, + #{item.thirdBuyCode}, + #{item.thirdSys}, + #{item.type}) @@ -96,5 +106,4 @@ where thirdSys = #{thirdSys} and type = #{type} - - \ No newline at end of file + diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 46ff18635..4c01a2e75 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -2,3 +2,4 @@ CALL Pro_Temp_ColumnWork('io_order', 'fromReceiveBillNo', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('io_order', 'fromThrBillNo', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'thirdSysName', 'varchar(255) ', 3); +CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ', 3);