From 92f760d50be8c1071b4145e5812c652ed3ea33fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 20 Jul 2023 15:36:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoOrderDetailResultController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index 09e4f688c..6bdc3790f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -275,7 +275,7 @@ public class IoOrderDetailResultController extends BaseController { ioOrderDetailResultData.put("manufacturer", ioOrderDetailResultResponse.getManufacturer() == null ? ' ' : ioOrderDetailResultResponse.getManufacturer()); ioOrderDetailResultData.put("measname", ioOrderDetailResultResponse.getMeasname() == null ? ' ' : ioOrderDetailResultResponse.getMeasname()); ioOrderDetailResultData.put("spec", ioOrderDetailResultResponse.getSpec() == null ? ' ' : ioOrderDetailResultResponse.getSpec()); - ioOrderDetailResultData.put("price", ioOrderDetailResultResponse.getPrice() == null ? ' ' : ioOrderDetailResultResponse.getPrice()); + ioOrderDetailResultData.put("price", ioOrderDetailResultResponse.getPrice() == null ? null : ioOrderDetailResultResponse.getPrice()); ioOrderDetailResultData.put("count", ioOrderDetailResultResponse.getCount()); ioOrderDetailResultData.put("reCount", ioOrderDetailResultResponse.getReCount()); ioOrderDetailResultData.put("inCount", ioOrderDetailResultResponse.getInCount()); From 80c5d58787acc771484cf1782e839737b430530a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 20 Jul 2023 15:37:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=EF=BC=88=E5=9B=9E=E4=BC=A0=E8=87=AA=E5=8A=A9=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=8F=B7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java | 3 +++ .../glxp/api/service/inout/impl/PlatformServiceImpl.java | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java index 555c6bfe8..026c5b850 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java @@ -271,5 +271,8 @@ public class IoOrderEntity { @TableField(value = "outSickInfo") private String outSickInfo; + @TableField(value = "fromSpmsOrders") + private String fromSpmsOrders; + } diff --git a/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java index 74d86f745..c39021e05 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java @@ -383,6 +383,12 @@ public class PlatformServiceImpl implements PlatformService { JSON.toJSONString(ioUploadOrderResponse), buildHeader(platformLinkRespons.getAppid(), platformLinkRespons.getSecretKey())); //回调结果 返回信息 if (StrUtil.isNotBlank(resp) && resp.contains("20000")) { + BaseResponse baseResponse= JSON.parseObject(resp, BaseResponse.class); + String formSpmsOrders= (String) baseResponse.getData(); + IoOrderEntity ioOrderEntity1=new IoOrderEntity(); + ioOrderEntity1.setFromSpmsOrders(formSpmsOrders); + ioOrderEntity1.setBillNo(orderId); + ioOrderService.updateByBillNo(ioOrderEntity1); return JSON.parseObject(resp, BaseResponse.class); } else { log.error("获取自助平台分库失败"); From 02f9c363c0b4d920f7c58adb3684fbb3346e1691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 20 Jul 2023 15:38:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E8=A1=A8=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=87=AA=E5=8A=A9=E5=8D=95=E5=8F=B7sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/schemas/schema_v2.1.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 6b8e5226c..b1d1c2c58 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -602,3 +602,5 @@ CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('io_order', 'fromSpmsOrders', 'varchar(255)', 1); + From acd37c413a8b733342b620378d4048ffcee7a1c6 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 20 Jul 2023 16:24:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E6=89=A7=E8=A1=8C=E5=87=8F=E4=B8=80?= =?UTF-8?q?=20=E6=89=AB=E7=A0=81=E6=95=B0=E9=87=8F=E6=9C=AA=E5=8F=98?= =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/inout/impl/IoOrderServiceImpl.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index e7a6b7bbd..44307f71b 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -326,8 +326,18 @@ public class IoOrderServiceImpl implements IoOrderService { ioOrderDetailResultEntity.setReCount(ioOrderDetailResultEntity.getReCount() - reCount); ioOrderDetailResultService.update(ioOrderDetailResultEntity); } else { + int reCount = udiCalCountUtil.getActCount(ioCodeEntity.getNameCode()); //如果数量扣减之后为0，直接删除此条码 codeService.deleteById(ioCodeEntity.getId()); + //更新扫码单据详情 + IoOrderDetailCodeEntity ioOrderDetailCodeEntity = ioOrderDetailCodeService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo()); + ioOrderDetailCodeEntity.setReCount(ioOrderDetailCodeEntity.getReCount() - reCount); + ioOrderDetailCodeService.update(ioOrderDetailCodeEntity); + + //更新结果详情 + IoOrderDetailResultEntity ioOrderDetailResultEntity = ioOrderDetailResultService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo()); + ioOrderDetailResultEntity.setReCount(ioOrderDetailResultEntity.getReCount() - reCount); + ioOrderDetailResultService.update(ioOrderDetailResultEntity); } //已审核单据需扣减库存 if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) { @@ -399,6 +409,7 @@ public class IoOrderServiceImpl implements IoOrderService { int count = invProductDetailEntity.getCount() - 1; int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode()); if (count == 0) { + invProductDetailService.deleteById(invProductDetailEntity.getId()); } else { //更新详情表