diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 11313d21..dca3d6b6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -627,7 +627,7 @@ public class IoCodeTempController extends BaseController { exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getActCount(udiRelevanceResponses.get(0))); - if (!StringUtils.isNotBlank(exitLocalEntity.getSerialNo())) { + if (StringUtils.isNotBlank(exitLocalEntity.getSerialNo())) { return ResultVOUtils.error(500, "重复扫码!"); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java index c29c2b36..33e52ab4 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java @@ -37,7 +37,6 @@ public class IoOrderDetailCodeController { @GetMapping("udiwms/inout/order/draft/detailCode") public BaseResponse getDraftsDetailCode(String orderId) { List orderEntityList = ioOrderDetailCodeService.checkOrderList(orderId); - List list = ioOrderDetailCodeService.getDetailCodeResponse(orderEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(Long.valueOf(list.size())); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index ecd20fb4..70ced51f 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -41,7 +41,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { @Override public List findByOrderId(String orderId) { - return ioOrderDetailBizDao.selectList(new QueryWrapper().eq("orderIdFk", orderId).orderByDesc("updateTime")); + return ioOrderDetailBizDao.selectList(new QueryWrapper().eq("orderIdFk", orderId)); } @Override diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java index 95394ffb..79c06635 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java @@ -40,7 +40,7 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService { @Override public List findByOrderId(String orderId) { - return ioOrderDetailCodeDao.selectList(new QueryWrapper().eq("orderIdFk", orderId).orderByDesc("updateTime")); + return ioOrderDetailCodeDao.selectList(new QueryWrapper().eq("orderIdFk", orderId).orderByDesc("id")); } @Override diff --git a/src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml b/src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml index 372730bc..bcfd22c5 100644 --- a/src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml @@ -1,7 +1,6 @@ - - - - \ 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 2a85ca6d..b66b8c10 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -380,6 +380,8 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'spaceOut', 'tinyint', 1); CALL Pro_Temp_ColumnWork('io_order_detail_code', 'id', 'bigint ', 2); CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'id', 'bigint ', 2); + + CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'bigint ', 2); @@ -412,7 +414,7 @@ INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `cu VALUES (5, 33, 110, 0, NULL, '内部码报表打印', NULL, NULL, NULL, NULL, 'reportForms'); CALL Pro_Temp_ColumnWork('basic_udirel', 'zdcfsycs', 'int', 1); CALL Pro_Temp_ColumnWork('io_order_detail_code', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'updateTime', 'datetime ', 1); - -call Modify_index('basic_products','uuid','idx_uuid','BTREE'); +call Modify_index('basic_products', 'uuid', 'idx_uuid', 'BTREE');