流向加单据类型名称，新增产品审核后自动添加到耗材字典

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);

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;
 }

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;
 }

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`
         <where>
             <if test="id != '' and id!=null">
                 and stock_order.id =#{id}