1.修复库存查询问题

2.修复流向查询无数据的问题
3.修复打印功能错误问题，单据打印模板关联关系表字段删除未使用的字段

src/main/java/com/glxp/udi/admin/controller/inout/StockQRCodeTextController.java

@@ -307,6 +307,7 @@ public class StockQRCodeTextController {
         SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest();
         systemPDFTemplateRelevanceRequest.setLocalAction(orderEntity.getAction());
         systemPDFTemplateRelevanceRequest.setModuleId(inspectionPDFTemplateRequest.getModuleId());
+        systemPDFTemplateRelevanceRequest.setCustomerId(orderEntity.getCustomerId().toString());
         IPage<SystemPDFTemplateRelevanceResponse> page = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
         if (page.getTotal() == 0) {
             return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到模板文件");

src/main/java/com/glxp/udi/admin/controller/inout/UdiTraceController.java

@@ -196,7 +196,7 @@ public class UdiTraceController {
                 return null;
             }
             FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
-            filterInvProductDetailRequest.setProductIdFk(udiInfoEntity.getUuid());
+            filterInvProductDetailRequest.setProductIdFk(String.valueOf(udiInfoEntity.getId()));
             filterInvProductDetailRequest.setBatchNo(udiEntity.getBatchNo());
             if (warehouseQueryRequest.getCustomerId() != null) {
                 filterInvProductDetailRequest.setCustomerId(warehouseQueryRequest.getCustomerId() + "");

src/main/java/com/glxp/udi/admin/controller/param/SystemPDFModuleController.java

@@ -94,6 +94,7 @@ public class SystemPDFModuleController {
                 SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity();
                 systemPDFTemplateRelevanceEntity.setLocalAction(bussinessTypeEntity.getAction());
                 systemPDFTemplateRelevanceEntity.setModuleId(systemPDFModuleRequest.getModuleId());
+                systemPDFTemplateRelevanceEntity.setCustomerId(Long.valueOf(systemPDFModuleRequest.getCustomerId()));
                 systemPDFTemplateRelevanceService.insert(systemPDFTemplateRelevanceEntity);
             }
 
@@ -107,7 +108,7 @@ public class SystemPDFModuleController {
     @AuthRuleAnnotation("system/pdf/module/updateRl")
     @PostMapping("/system/pdf/module/updateRl")
     public BaseResponse updateRl(@RequestBody SystemPDFTemplateRelevanceEntity systemPDFModuleSaveRequest) {
-        systemPDFTemplateRelevanceService.udpateRl(systemPDFModuleSaveRequest);
+        systemPDFTemplateRelevanceService.updateRl(systemPDFModuleSaveRequest);
         return ResultVOUtils.success("修改成功");
     }
 

src/main/java/com/glxp/udi/admin/controller/param/SystemPDFTemplateController.java

@@ -3,7 +3,6 @@ package com.glxp.udi.admin.controller.param;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
 import com.glxp.udi.admin.common.res.BaseResponse;
 import com.glxp.udi.admin.entity.param.SystemPDFTemplateEntity;
@@ -49,7 +48,7 @@ public class SystemPDFTemplateController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        Page<SystemPDFTemplateEntity> page = systemPDFTemplateService.queryPage(systemPDFTemplateRequest);
+        IPage<SystemPDFTemplateEntity> page = systemPDFTemplateService.queryPage(systemPDFTemplateRequest);
         List<SystemPDFTemplateResponse> systemPDFTemplateResponseList = page.getRecords().stream().map(item -> {
             SystemPDFTemplateResponse systemPDFTemplateResponse = new SystemPDFTemplateResponse();
             BeanUtils.copyProperties(item, systemPDFTemplateResponse);

src/main/java/com/glxp/udi/admin/dao/param/SystemPDFTemplateRelevanceDao.java

@@ -49,7 +49,7 @@ public interface SystemPDFTemplateRelevanceDao extends BaseMapper<SystemPDFTempl
     boolean insertData(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity);
 
 
-    boolean udpateRl(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity);
+    boolean updateRl(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity);
 
     IPage<SystemPDFTemplateRelevanceResponse> filterList(@Param("page") IPage<SystemPDFTemplateRelevanceResponse> page, @Param("moduleId") Integer moduleId, @Param("localAction") String localAction, @Param("customerId") String customerId);
 

src/main/java/com/glxp/udi/admin/entity/param/SystemPDFTemplateRelevanceEntity.java

@@ -16,8 +16,6 @@ public class SystemPDFTemplateRelevanceEntity {
 
     private Long customerId;
 
-    private Integer adminId;
-
     private Integer moduleId;
 
     private String localAction;

src/main/java/com/glxp/udi/admin/service/inout/InvProductDetailService.java

@@ -85,7 +85,7 @@ public class InvProductDetailService {
         QueryWrapper<InvProductDetailEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StrUtil.isNotBlank(detailParams.getBatchNo()), "batchNo", detailParams.getBatchNo())
                 .eq(StrUtil.isNotBlank(detailParams.getProductIdFk()), "productIdFk", detailParams.getProductIdFk())
-                .eq(CollUtil.isNotEmpty(detailParams.getInvCodes()), "locStorageCode", detailParams.getInvCodes());
+                .in(CollUtil.isNotEmpty(detailParams.getInvCodes()), "locStorageCode", detailParams.getInvCodes());
         return invProductDetailDao.selectCount(wrapper);
     }
 

src/main/java/com/glxp/udi/admin/service/inout/InvProductService.java

@@ -35,7 +35,7 @@ public class InvProductService {
                 .eq(StrUtil.isNotBlank(filterInvProductRequest.getCustomerId()), "customerId", filterInvProductRequest.getCustomerId())
                 .in(CollUtil.isNotEmpty(filterInvProductRequest.getInvCodes()), "locStorageCode", filterInvProductRequest.getInvCodes())
                 .eq(StrUtil.isNotBlank(filterInvProductRequest.getNameCode()), "nameCode", filterInvProductRequest.getNameCode())
-                .like(StrUtil.isNotBlank(filterInvProductRequest.getProductsName()), "productName", filterInvProductRequest.getProductsName())
+                .like(StrUtil.isNotBlank(filterInvProductRequest.getProductsName()), "productsName", filterInvProductRequest.getProductsName())
                 .like(StrUtil.isNotBlank(filterInvProductRequest.getZczbhhzbapzbh()), "zczbhhzbapzbh", filterInvProductRequest.getZczbhhzbapzbh())
                 .like(StrUtil.isNotBlank(filterInvProductRequest.getManufactory()), "manufactory", filterInvProductRequest.getManufactory())
                 .like(StrUtil.isNotBlank(filterInvProductRequest.getGgxh()), "ggxh", filterInvProductRequest.getGgxh());

src/main/java/com/glxp/udi/admin/service/inout/OrderService.java

@@ -124,11 +124,13 @@ public class OrderService {
     }
 
     public OrderEntity findByOne(String orderId) {
-        OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
-        orderFilterRequest.setId(orderId);
-        List<OrderEntity> orderMdEntities = findAll(orderFilterRequest);
-        if (orderMdEntities != null && orderMdEntities.size() > 0) {
-            return orderMdEntities.get(0);
+        if (StrUtil.isNotBlank(orderId)) {
+            OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
+            orderFilterRequest.setId(orderId);
+            List<OrderEntity> orderMdEntities = findAll(orderFilterRequest);
+            if (CollUtil.isNotEmpty(orderMdEntities)) {
+                return orderMdEntities.get(0);
+            }
         }
         return null;
     }

src/main/java/com/glxp/udi/admin/service/param/SystemPDFTemplateRelevanceService.java

@@ -42,7 +42,7 @@ public class SystemPDFTemplateRelevanceService {
         return systemPDFTemplateRelevanceDao.insertData(systemPDFTemplateRelevanceEntity);
     }
 
-    public boolean udpateRl(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity) {
-        return systemPDFTemplateRelevanceDao.udpateRl(systemPDFTemplateRelevanceEntity);
+    public boolean updateRl(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity) {
+        return systemPDFTemplateRelevanceDao.updateRl(systemPDFTemplateRelevanceEntity);
     }
 }

src/main/java/com/glxp/udi/admin/service/param/SystemPDFTemplateService.java

@@ -22,41 +22,32 @@ public class SystemPDFTemplateService {
     @Resource
     private SystemPDFTemplateDao systemPDFTemplateDao;
 
-    public Page<SystemPDFTemplateEntity> queryPage(SystemPDFTemplateRequest systemPDFTemplateRequest) {
-        Page<SystemPDFTemplateEntity> page = new Page<>(systemPDFTemplateRequest.getPage(), systemPDFTemplateRequest.getLimit());
+    public IPage<SystemPDFTemplateEntity> queryPage(SystemPDFTemplateRequest systemPDFTemplateRequest) {
+        IPage<SystemPDFTemplateEntity> page = new Page<>(systemPDFTemplateRequest.getPage(), systemPDFTemplateRequest.getLimit());
         return systemPDFTemplateDao.selectPage(page, buildQueryWrapper(systemPDFTemplateRequest));
     }
 
-    public Page<SystemPDFTemplateEntity> listPDFTemplates(Integer page, Integer limit) {
-        Page<SystemPDFTemplateEntity> pageParam = new Page<>(page, limit);
-        if (null == page || null == limit) {
-            pageParam = new Page<>(0, 100);
-        }
-        return systemPDFTemplateDao.listPDFTemplates(pageParam);
-    }
-
     public SystemPDFTemplateEntity selectById(String id) {
         return systemPDFTemplateDao.selectById(id);
     }
 
-    public boolean updateById(SystemPDFTemplateSaveRequest systemPDFTemplateSaveRequest) {
-        return systemPDFTemplateDao.updateByParams(systemPDFTemplateSaveRequest);
+    /**
+     * 更新模板，同步修改模板关联表数据
+     *
+     * @param systemPDFTemplateSaveRequest
+     */
+    public void updateById(SystemPDFTemplateSaveRequest systemPDFTemplateSaveRequest) {
+        systemPDFTemplateDao.updateByParams(systemPDFTemplateSaveRequest);
     }
 
     public boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity) {
         int insert = systemPDFTemplateDao.insert(systemPDFTemplateEntity);
-        if (insert > 0) {
-            return true;
-        }
-        return false;
+        return insert > 0;
     }
 
     public boolean deleteById(Integer id) {
         int i = systemPDFTemplateDao.deleteById(id);
-        if (i > 0) {
-            return true;
-        }
-        return false;
+        return i > 0;
     }
 
     /**

src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml

@@ -96,7 +96,7 @@
                 employeeName=#{employeeName},
             </if>
             <if test="comments != null">
-                comments = #{comments},
+                comments = #{comments}
             </if>
         </set>
         WHERE id = #{id}

src/main/resources/mybatis/mapper/param/SystemPDFTemplateRelevanceDao.xml

@@ -96,15 +96,14 @@
         insert
             ignore
         INTO system_pdf_template_relevance
-            (templateId, customerId, adminId, moduleId, localAction)
+            (templateId, customerId, moduleId, localAction)
         values (#{templateId},
                 #{customerId},
-                #{adminId},
                 #{moduleId},
                 #{localAction})
     </insert>
 
-    <update id="udpateRl" parameterType="com.glxp.udi.admin.entity.param.SystemPDFTemplateRelevanceEntity">
+    <update id="updateRl" parameterType="com.glxp.udi.admin.entity.param.SystemPDFTemplateRelevanceEntity">
         UPDATE system_pdf_template_relevance
         <trim prefix="set" suffixOverrides=",">
             <if test="templateId != null">
@@ -113,9 +112,6 @@
             <if test="customerId != null">
                 customerId = #{customerId},
             </if>
-            <if test="adminId != null">
-                adminId = #{adminId},
-            </if>
             <if test="moduleId != null">
                 moduleId = #{moduleId},
             </if>