From f9cf57fcd8a065c24f8cbd228a30c76f2b8ada02 Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 20 Dec 2022 17:26:20 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9B=98=E7=82=B9=E5=8D=95=E6=8D=AE=E9=97=AE=E9=A2=98?= =?UTF-8?q?=202.=E4=BF=AE=E5=A4=8D=E5=88=86=E5=BA=93=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E9=87=8D=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/admin/dao/inventory/InvCountOrderDao.java | 7 +++++++ .../inventory/impl/InvCountOrderServiceImpl.java | 12 +++++++++--- .../mybatis/mapper/inventory/InvCountOrderDao.xml | 5 +++++ .../mybatis/mapper/inventory/InvSubWarehouseDao.xml | 1 + api-admin/src/main/resources/schemas/schema_v2.1.sql | 5 +++-- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDao.java index ae8b4c47..92844282 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDao.java @@ -65,4 +65,11 @@ public interface InvCountOrderDao { * @return */ InvCountOrder selectByOrderId(@Param("orderId") String orderId); + + /** + * 根据单据号删除单据 + * + * @param orderId + */ + void deleteByOrderId(@Param("orderId") String orderId); } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java index d01d875a..a7a0f8c2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java @@ -88,9 +88,15 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { @Override public void deleteOrder(String id) { String orderId = invCountOrderDao.selectOrderIdById(id); - invCountOrderDao.deleteByPrimaryKey(Integer.valueOf(id)); - invCountOrderDetailDao.deleteByOrderId(orderId); - invCountCodesDao.deleteByOrderId(orderId); + log.info("开始删除盘点单据,盘点单号: {}", orderId); + invCountOrderDao.deleteByOrderId(orderId); + if (invCountOrderDetailDao.countByOrderIdFk(orderId) > 0) { + invCountOrderDetailDao.deleteByOrderId(orderId); + } + if (invCountCodesDao.countByOrderIdFk(orderId) > 0) { + invCountCodesDao.deleteByOrderId(orderId); + } + log.info("盘点单据删除完成"); } @Override diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDao.xml index f68198c0..4534ecb5 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDao.xml @@ -414,4 +414,9 @@ from inv_count_order where orderId = #{orderId} + + + delete from inv_count_order + where orderId = #{orderId} + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml index b8e934a9..891c93ea 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml @@ -255,5 +255,6 @@ AND a.parentId = #{pcode} + GROUP BY a.code \ No newline at end of file diff --git a/api-admin/src/main/resources/schemas/schema_v2.1.sql b/api-admin/src/main/resources/schemas/schema_v2.1.sql index 91c56e03..9e8af234 100644 --- a/api-admin/src/main/resources/schemas/schema_v2.1.sql +++ b/api-admin/src/main/resources/schemas/schema_v2.1.sql @@ -3,10 +3,11 @@ CALL Pro_Temp_ColumnWork ('basic_export_status','receiveStatus','varchar(255) ', 1); CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1); CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1); +CALL Pro_Temp_ColumnWork ('pur_plan','billType','varchar(255) ', 2); -INSERT ignore INTO sys_scheduled (`cronName`, `cron`, `customerId`, `remark`) VALUES ('downloadSpDataTask', '0 0/1 * * * ?', NULL, '立即下载自助平台数据'); - +ALTER TABLE pur_plan + MODIFY COLUMN `billType` varchar(255) NULL DEFAULT NULL COMMENT '申购类型' AFTER `status`; -- 创建表时必须 create table if not exists 表名