From 1c4e84ff4d42e64b88e020bb3ac22020dbe7433f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 19 Apr 2023 13:47:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A0=81=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inv/InvInnerOrderPrintController.java | 9 ++++++++- .../com/glxp/api/res/inv/InnerOrderPrintResponse.java | 2 ++ .../mybatis/mapper/inv/InvInnerOrderPrintDao.xml | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java index 5069c077..cb1252cd 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java @@ -182,15 +182,22 @@ public class InvInnerOrderPrintController { } + String orderId=""; for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) { InvInnerOrderPrintEntity innerOrderPrintEntity = new InvInnerOrderPrintEntity(); innerOrderPrintEntity.setStatus(1); innerOrderPrintEntity.setId(InnerOrderPrintResponse.getId()); invInnerOrderPrintService.updateOrder(innerOrderPrintEntity); + orderId=InnerOrderPrintResponse.getId()+""; } + + //查询订单id + InvInnerOrderPrintEntity innerOrderPrintEntity=invInnerOrderPrintService.selectById(orderId); + IoOrderEntity ioOrderEntity=new IoOrderEntity(); ioOrderEntity.setInCodeStatus(1); - ioOrderService.update(ioOrderEntity); + ioOrderEntity.setBillNo(innerOrderPrintEntity.getOrderIdFk()); + ioOrderService.updateByBillNo(ioOrderEntity); return null; } diff --git a/src/main/java/com/glxp/api/res/inv/InnerOrderPrintResponse.java b/src/main/java/com/glxp/api/res/inv/InnerOrderPrintResponse.java index b3da9609..df71d503 100644 --- a/src/main/java/com/glxp/api/res/inv/InnerOrderPrintResponse.java +++ b/src/main/java/com/glxp/api/res/inv/InnerOrderPrintResponse.java @@ -33,6 +33,8 @@ public class InnerOrderPrintResponse { private String sOrderId; private String sDetailId; private Date updateTime; + private Date createTime; + private Integer status; private Integer count; diff --git a/src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml b/src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml index 943eb479..a9be96f0 100644 --- a/src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml @@ -43,6 +43,9 @@ resultType="com.glxp.api.res.inv.InnerOrderPrintResponse"> SELECT inv_inner_order_print.id, inv_inner_order_print.udiCode, + inv_inner_order_print.createTime, + inv_inner_order_print.status, + inv_inner_order_print.updateTime, basic_products.nameCode, inv_inner_order_print.batchNo, inv_inner_order_print.productDate, @@ -52,6 +55,7 @@ basic_products.ylqxzcrbarmc, basic_products.zczbhhzbapzbh, basic_products.ggxh + FROM inv_inner_order_print LEFT JOIN basic_udirel ON inv_inner_order_print.productId = basic_udirel.id INNER JOIN basic_products ON basic_products.uuid = basic_udirel.uuid