From 170d650d61abbdca012512e00e18f59aa3fd2555 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 9 Dec 2022 11:45:05 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=92=A4=E5=9B=9E=E6=9C=AA?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=E5=8D=95=E6=8D=AE=E5=90=8E=E6=9C=AA=E7=BD=AE?= =?UTF-8?q?=E7=A9=BA=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE=E5=85=B3=E8=81=94?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E5=8F=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/sale/admin/dao/inout/OrderDetailDao.java | 8 ++++++++ .../service/inout/impl/StockOrderServiceImpl.java | 14 +++++++------- .../mybatis/mapper/inout/OrderDetailDao.xml | 6 +++++- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/OrderDetailDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/OrderDetailDao.java index 9d0d318..abd4d6f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/OrderDetailDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/OrderDetailDao.java @@ -70,4 +70,12 @@ public interface OrderDetailDao { * @return */ List filterErpOrder(@Param("filterErpOrderRequest") FilterErpOrderRequest filterErpOrderRequest); + + /** + * 更新扫码单据详情关联的业务单据号 + * + * @param orderIdFk 扫码单据ID + * @param erpOrderId 关联业务单据号 + */ + void updateErpOrderId(@Param("orderIdFk") String orderIdFk, @Param("erpOrderId") String erpOrderId); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java index 9dc6071..460f002 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java @@ -8,6 +8,7 @@ import com.glxp.sale.admin.constant.ConstantType; import com.glxp.sale.admin.dao.basic.BussinessLocalTypeDao; import com.glxp.sale.admin.dao.inout.CodesDao; import com.glxp.sale.admin.dao.inout.OrderDao; +import com.glxp.sale.admin.dao.inout.OrderDetailDao; import com.glxp.sale.admin.dao.inout.StockOrderDao; import com.glxp.sale.admin.dao.inventory.InvPreInProductDao; import com.glxp.sale.admin.dao.inventory.InvPreInProductDetailDao; @@ -61,6 +62,8 @@ public class StockOrderServiceImpl implements StockOrderService { private CodesTempService codesTempService; @Resource BussinessTypeService bussinessTypeService; + @Resource + private OrderDetailDao orderDetailDao; @Override @@ -202,19 +205,16 @@ public class StockOrderServiceImpl implements StockOrderService { stockOrderEntity.setOrderIdFk(""); stockOrderDao.updateById(stockOrderEntity); orderDao.updateOrder(orderEntity); + //置空扫码单据详情关联的业务单据号 + orderDetailDao.updateErpOrderId(orderEntity.getId(), null); } else { orderEntity.setErpFk(""); stockOrderDao.deleteById(stockOrderEntity.getId()); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); orderDao.updateOrder(orderEntity); - List warehouseEntityList = codesDao.findByReceiptId(orderEntity.getId()); - if (CollUtil.isNotEmpty(warehouseEntityList)) { - codesTempService.insertCodesTemp(warehouseEntityList); - codesDao.deleteByOrderId(orderEntity.getId()); - } + //置空扫码单据详情关联的业务单据号 + orderDetailDao.updateErpOrderId(orderEntity.getId(), null); } - - } else { //回退已完成单据 diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDetailDao.xml index 478ccde..a688619 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDetailDao.xml @@ -289,5 +289,9 @@ - + + update io_order_detail + set erpOrderId = #{erpOrderId} + where orderIdFk = #{orderIdFk} + \ No newline at end of file