From 882dc7cc76f045be88172d0495f42a91f281e7b5 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Wed, 17 Aug 2022 14:13:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E5=90=91=E5=8A=A0=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=AE=A1=E6=A0=B8=E5=90=8E=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B0=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/thrsys/ThrProductsAddController.java | 10 +++++++++- .../sale/admin/entity/inout/StockOrderPrintEntity.java | 1 + .../glxp/sale/admin/res/inout/UdiTraceResponse.java | 1 + .../resources/mybatis/mapper/inout/StockOrderDao.xml | 3 ++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java index 6f27ab8..0da8089 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java @@ -3,12 +3,14 @@ package com.glxp.sale.admin.controller.thrsys; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.auth.CustomerService; +import com.glxp.sale.admin.service.basic.BasicThirdSysService; import com.glxp.sale.admin.service.basic.UdiContrastService; import com.glxp.sale.admin.service.thrsys.ThrProductsAddService; import com.glxp.sale.admin.service.thrsys.ThrProductsService; @@ -75,6 +77,8 @@ public class ThrProductsAddController { @Resource UdiContrastService udiContrastService; + @Resource + BasicThirdSysService basicThirdSysService; @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/updateThrAddProducts") @@ -91,7 +95,11 @@ public class ThrProductsAddController { thrProductsEntity.setUpdateTime(new Date()); thrProductsService.insertThrProducts(thrProductsEntity); //审核通过后直接加到耗材字典里 - udiContrastService.createOnlyMainId(thrProductsAddEntity.getCode()); + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + if (basicThirdSysEntity.getThirdId().equals(thrProductsAddEntity.getThirdSysFk())) + if (!udiContrastService.isExit(null, thrProductsAddEntity.getCode(), null)) { + udiContrastService.createOnlyMainId(thrProductsAddEntity.getCode()); + } } else if (thrProductsAddEntity.getCheckStatus().equals(3)) { //不通过，删除第三方产品信息表中此产品数据 thrProductsService.delete(thrProductsAddEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java index 94af884..8fb6f30 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java @@ -52,4 +52,5 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity { private String serialNo; //序列号 private String nameCode; + private String deptName; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/UdiTraceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/UdiTraceResponse.java index b84d051..3a05b98 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/UdiTraceResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/UdiTraceResponse.java @@ -18,4 +18,5 @@ public class UdiTraceResponse { private String batchNo; private String produceDate; private String expireDate; + private String billTypeName; } diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml index 025e897..2dc2a75 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -277,7 +277,7 @@ stock_order_detail.expireDate, stock_order_detail.count, stock_order_detail.sweepCount, stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, stock_order_detail.zczbhhzbapzbh, stock_order_detail.price,inv_warehouse.name locInv,basic_products.spmc, - basic_products.cpms,basic_udirel.measname + basic_products.cpms,basic_udirel.measname,auth_dept.`name` deptName FROM stock_order INNER JOIN stock_order_detail on stock_order.id = stock_order_detail.orderIdFk LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code` @@ -285,6 +285,7 @@ LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code` left join basic_udirel on stock_order_detail.productId = basic_udirel.id left JOIN basic_products on basic_products.uuid = basic_udirel.uuid + left join auth_dept on stock_order.dept = auth_dept.`code` and stock_order.id =#{id}