打印问题，产品关联问题，新增计量单位关联，一些一流的产品关联问题修复

api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java

@@ -136,6 +136,7 @@ public class UdiContrastController {
         udiRelevanceEntity.setUpdateTime(time);
         udiRelevanceEntity.setModifyTime(time);
         udiRelevanceEntity.setManufactory(combineRequest.getManufactory());
+        udiRelevanceEntity.setMeasname(combineRequest.getMeasname());
         udiRelevanceEntity.setSupName(combineRequest.getSupName());
         udiRelevanceEntity.setPrice(combineRequest.getPrice());
         UdiRelevanceEntity temp = udiContrastService.findById(udiRelevanceEntity.getId());
@@ -247,6 +248,7 @@ public class UdiContrastController {
         udiRelevanceEntity.setUpdateTime(time);
         udiRelevanceEntity.setModifyTime(time);
         udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid());
+        udiRelevanceEntity.setMeasname(combineRequest.getMeasname());
         if (combineRequest.getManufactory() != null) {
             udiRelevanceEntity.setManufactory(combineRequest.getManufactory());
         } else
@@ -284,6 +286,7 @@ public class UdiContrastController {
         udiRelevanceEntity.setThirdName(thrProductsEntity.getName());
         udiRelevanceEntity.setMainId(thrProductsEntity.getCode());
         udiRelevanceEntity.setMainName(thrProductsEntity.getName());
+        udiRelevanceEntity.setMeasname(thrProductsEntity.getMeasname());
         String time = DateUtil.getDateTime();
         udiRelevanceEntity.setUpdateTime(time);
         udiRelevanceEntity.setModifyTime(time);

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.admin.controller.business;
 
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.admin.annotation.AuthRuleAnnotation;
 import com.glxp.api.admin.constant.Constant;
@@ -13,6 +14,7 @@ import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity;
 import com.glxp.api.admin.entity.inventory.StockPrintEntity;
 import com.glxp.api.admin.entity.inventory.StockPrintTempEntity;
 import com.glxp.api.admin.req.basic.FilterStockprintRequest;
+import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest;
 import com.glxp.api.admin.req.business.StockQRCodeTextFilterRequest;
 import com.glxp.api.admin.req.inout.DeleteRequest;
 import com.glxp.api.admin.req.inventory.DeleteStPrintTempRequest;
@@ -364,31 +366,72 @@ public class StockQRCodeTextController {
     public void stockOrderPDFFromTemplateFile(
             @RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest,
             HttpServletRequest request, HttpServletResponse response) throws Exception {
+        StockOrderEntity stockOrderEntity = stockOrderService.findById(stockQRCodeTextPDFTemplateRequest.getId());
+        SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest();
+        systemPDFTemplateRelevanceRequest.setModuleId(stockQRCodeTextPDFTemplateRequest.getModuleId());
+        systemPDFTemplateRelevanceRequest.setLocalAction(stockOrderEntity.getBillType());
+
+
+        List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
+        if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) return;
+        SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = systemPDFTemplateRelevanceResponses.get(0);
+
+        if (systemPDFTemplateRelevanceResponse.getPrintType() == 0) {
             /*打印订单*/
             List<StockOrderPrintEntity> list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId());
             if (list != null && list.size() > 0) {
 
                 SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(stockQRCodeTextPDFTemplateRequest.getModuleId() + "");
-            SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest();
-            systemPDFTemplateRelevanceRequest.setModuleId(systemPDFModuleEntity.getId());
-            systemPDFTemplateRelevanceRequest.setLocalAction(list.get(0).getBillType());
-            List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
-            if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) return;
-
-            SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = systemPDFTemplateRelevanceResponses.get(0);
                 SystemPDFTemplateEntity systemPDFTemplateEntity =
                         systemPDFTemplateService.selectById(String.valueOf(systemPDFTemplateRelevanceResponse.getTemplateId()));
-
                 systemPDFModuleEntity.setRemark1(systemPDFTemplateRelevanceResponse.getRemark1());
                 systemPDFModuleEntity.setRemark2(systemPDFTemplateRelevanceResponse.getRemark2());
                 systemPDFModuleEntity.setRemark3(systemPDFTemplateRelevanceResponse.getRemark3());
 
                 if (systemPDFTemplateEntity == null) return;
 
+                int index = 1;
+                CompanyEntity companyEntity = companyService.findCompany();//Long.parseLong(list.get(0).getCustomerId())
+                for (StockOrderPrintEntity stockOrderPrintEntity : list) {
+                    stockOrderPrintEntity.setIndex(index + "");
+                    stockOrderPrintEntity.setTitle(companyEntity.getName());
+                    stockOrderPrintEntity.setCorpName(stockOrderPrintEntity.getCorpName());
+                    stockOrderPrintEntity.setOrderName(stockQRCodeTextPDFTemplateRequest.getOrderName());
+                    stockOrderPrintEntity.setRemark1(systemPDFModuleEntity.getRemark1());
+                    stockOrderPrintEntity.setRemark2(systemPDFModuleEntity.getRemark2());
+                    stockOrderPrintEntity.setRemark3(systemPDFModuleEntity.getRemark3());
+                    index++;
+                }
+
+                Map<String, Object> data = new HashMap<String, Object>();
+                data.put("data", list);
+                JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf");
+                StockOrderEntity updateStockOrderEntity = new StockOrderEntity();
+                updateStockOrderEntity.setId(stockQRCodeTextPDFTemplateRequest.getId());
+                updateStockOrderEntity.setPrintStatus("102");
+                stockOrderService.updateById(updateStockOrderEntity);
+
+            }
+        } else {
+            /*打印订单*/
+            StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest();
+            stockOrderDetailFilterRequest.setOrderIdFk(stockOrderEntity.getId());
+            List<StockOrderDetailEntity> stockOrderDetailEntities = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
+            List<StockOrderPrintEntity> list = stockOrderService.listCodePrint(stockOrderEntity.getOrderIdFk());
+            if (list != null && list.size() > 0) {
+                SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(stockQRCodeTextPDFTemplateRequest.getModuleId() + "");
+                SystemPDFTemplateEntity systemPDFTemplateEntity =
+                        systemPDFTemplateService.selectById(String.valueOf(systemPDFTemplateRelevanceResponse.getTemplateId()));
+                systemPDFModuleEntity.setRemark1(systemPDFTemplateRelevanceResponse.getRemark1());
+                systemPDFModuleEntity.setRemark2(systemPDFTemplateRelevanceResponse.getRemark2());
+                systemPDFModuleEntity.setRemark3(systemPDFTemplateRelevanceResponse.getRemark3());
+
+                if (systemPDFTemplateEntity == null) return;
 
                 int index = 1;
                 CompanyEntity companyEntity = companyService.findCompany();//Long.parseLong(list.get(0).getCustomerId())
                 for (StockOrderPrintEntity stockOrderPrintEntity : list) {
+                    BeanUtils.copyProperties(stockOrderEntity, stockOrderPrintEntity);
                     stockOrderPrintEntity.setIndex(index + "");
                     stockOrderPrintEntity.setTitle(companyEntity.getName());
                     stockOrderPrintEntity.setCorpName(stockOrderPrintEntity.getCorpName());
@@ -396,6 +439,12 @@ public class StockQRCodeTextController {
                     stockOrderPrintEntity.setRemark1(systemPDFModuleEntity.getRemark1());
                     stockOrderPrintEntity.setRemark2(systemPDFModuleEntity.getRemark2());
                     stockOrderPrintEntity.setRemark3(systemPDFModuleEntity.getRemark3());
+                    StockOrderDetailEntity stockOrderDetailEntity = getDetailByRelBatch(stockOrderDetailEntities, stockOrderPrintEntity.getProductId(), stockOrderPrintEntity.getBatchNo());
+                    if (stockOrderDetailEntity != null) {
+                        stockOrderPrintEntity.setPrice(stockOrderDetailEntity.getPrice());
+                    }
+
+
                     index++;
                 }
 
@@ -406,8 +455,20 @@ public class StockQRCodeTextController {
                 updateStockOrderEntity.setId(stockQRCodeTextPDFTemplateRequest.getId());
                 updateStockOrderEntity.setPrintStatus("102");
                 stockOrderService.updateById(updateStockOrderEntity);
+            }
+        }
+    }
 
+
+    public StockOrderDetailEntity getDetailByRelBatch(List<StockOrderDetailEntity> stockOrderDetailEntities, String relId, String batchNo) {
+        for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) {
+            if (StrUtil.trim(stockOrderDetailEntity.getBatchNo()).equals(StrUtil.trim(batchNo))
+                    && StrUtil.trim(stockOrderDetailEntity.getRelId()).equals(StrUtil.trim(relId))
+            ) {
+                return stockOrderDetailEntity;
+            }
         }
+        return null;
     }
 
     @AuthRuleAnnotation("")

api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDao.java

@@ -33,6 +33,8 @@ public interface StockOrderDao {
 
     List<StockOrderPrintEntity> listOrderPrint(StockOrderFilterRequest stockOrderFilterRequest);
 
+    List<StockOrderPrintEntity> listCodePrint(StockOrderFilterRequest stockOrderFilterRequest);
+
     void updateSupplementNoByBillNo(@Param("billNo") String billNo, @Param("supplementOrderNo") String supplementOrderNo);
 
     /**

api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemPDFTemplateRelevanceEntity.java

@@ -16,5 +16,5 @@ public class SystemPDFTemplateRelevanceEntity {
     private String remark1;
     private String remark2;
     private String remark3;
-
+    private int printType;
 }

api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java

@@ -22,6 +22,7 @@ public class CombineRequest {
     private Long customerId;
     private Boolean supEnable;
     private String manufactory;
+    private String measname;
     private String supName;
     private String price;
     private boolean idSpliUdi;

api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java

@@ -39,4 +39,6 @@ public class StockOrderFilterRequest extends ListPageRequest {
     private boolean entrustEnd;
     private String localAction;
 
+
+    private String orderId;
 }

api-admin/src/main/java/com/glxp/api/admin/res/basic/SystemPDFTemplateRelevanceResponse.java

@@ -21,6 +21,6 @@ public class SystemPDFTemplateRelevanceResponse {
     private String remark1;
     private String remark2;
     private String remark3;
-
+    private int printType;
 
 }

api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderService.java

@@ -40,6 +40,8 @@ public interface StockOrderService {
 
     List<StockOrderPrintEntity> listOrderPrint(String orderId);
 
+    List<StockOrderPrintEntity> listCodePrint(String orderId);
+
     /**
      * 导出已验收单据信息
      *

api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java

@@ -174,6 +174,17 @@ public class StockOrderServiceImpl implements StockOrderService {
         return stockOrderDao.listOrderPrint(stockOrderFilterRequest);
     }
 
+    @Override
+    public List<StockOrderPrintEntity> listCodePrint(String orderId) {
+
+        if (StrUtil.isEmpty(orderId)) {
+            return null;
+        }
+        StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
+        stockOrderFilterRequest.setOrderId(orderId);
+        return stockOrderDao.listCodePrint(stockOrderFilterRequest);
+    }
+
     @Override
     public List<StockOrderExportResponse> exportOrderData(StockOrderFilterRequest request) {
         //单据状态为已验收

api-admin/src/main/java/com/glxp/api/admin/thread/BasicBackUpdateProductService.java

@@ -135,6 +135,7 @@ public class BasicBackUpdateProductService {
                             udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName4());
                         }
                         udiRelevanceEntity1.setManufactory(invmandocResponse.getManufactory());
+                        udiRelevanceEntity1.setMeasname(invmandocResponse.getMeasname());
                         udiRelevanceEntity1.setThirdId(invmandocResponse.getCode());
                         udiRelevanceEntity1.setThirdName(invmandocResponse.getName());
                         String time = DateUtil.getDateTime();
@@ -266,6 +267,7 @@ public class BasicBackUpdateProductService {
                         }
 
                         udiRelevanceEntity1.setManufactory(thrProductsEntity.getManufactory());
+                        udiRelevanceEntity1.setMeasname(thrProductsEntity.getMeasname());
                         udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode());
                         udiRelevanceEntity1.setThirdName(thrProductsEntity.getName());
                         String time = DateUtil.getDateTime();
@@ -281,7 +283,4 @@ public class BasicBackUpdateProductService {
     }
 
 
-
-
-
 }

api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java

@@ -128,6 +128,9 @@ public class BasicUpdateProductService {
                         String time = DateUtil.getDateTime();
                         udiRelevanceEntity1.setUpdateTime(time);
                         udiRelevanceEntity1.setModifyTime(time);
+                        udiRelevanceEntity1.setPrice(thrProductsEntity.getPrice());
+                        udiRelevanceEntity1.setManufactory(thrProductsEntity.getManufactory());
+                        udiRelevanceEntity1.setMeasname(thrProductsEntity.getMeasname());
                         BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
                         String mainSys = basicThirdSysEntity.getThirdId();
                         if (mainSys.equals("thirdId")) {
@@ -188,7 +191,6 @@ public class BasicUpdateProductService {
             udiRelevanceEntity1.setThirdId4(onhandQueryResponse.getCode());
             udiRelevanceEntity1.setThirdName4(onhandQueryResponse.getName());
         }
-
         BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
         String mainSys = basicThirdSysEntity.getThirdId();
         if (mainSys.equals("thirdId")) {

api-admin/src/main/java/com/glxp/api/admin/util/JasperUtils.java

@@ -1,5 +1,6 @@
 package com.glxp.api.admin.util;
 
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import net.sf.jasperreports.engine.*;
 import net.sf.jasperreports.engine.export.ooxml.JRDocxExporter;
@@ -15,6 +16,7 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -42,7 +44,7 @@ public class JasperUtils {
         try {
             HashMap<String, Object> map = new HashMap<String, Object>();
             logger.error(JSON.toJSONString(data));
-            InputStream is = new ByteArrayInputStream(JSON.toJSONString(data).getBytes("UTF-8"));
+            InputStream is = new ByteArrayInputStream(JSONUtil.toJsonStr(data).getBytes(StandardCharsets.UTF_8));
             map.put("JSON_INPUT_STREAM", is); //填充报表数据
             map.put(JsonQueryExecuterFactory.JSON_LOCALE, Locale.ENGLISH);
             FileInputStream jasperStream = new FileInputStream(new File(jasperResource));
@@ -111,7 +113,7 @@ public class JasperUtils {
         try {
             HashMap<String, Object> map = new HashMap<String, Object>();
             logger.error(JSON.toJSONString(data));
-            InputStream is = new ByteArrayInputStream(JSON.toJSONString(data).getBytes("UTF-8"));
+            InputStream is = new ByteArrayInputStream(JSONUtil.toJsonStr(data).getBytes(StandardCharsets.UTF_8));
             map.put("JSON_INPUT_STREAM", is); //填充报表数据
             map.put(JsonQueryExecuterFactory.JSON_LOCALE, Locale.ENGLISH);
 //		    ClassPathResource resource = new ClassPathResource(jasperResource);

api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -399,7 +399,7 @@
         (id,
         thirdId,thirdName,uuid,isUseDy,updateTime,modifyTime,
         thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
-        ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price
+        ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price,modifyTime
         )
         values
             (
@@ -429,7 +429,7 @@
         #{lockStatus},
         #{udplatCode},
         #{isAdavence},
-        #{supName},#{price}
+        #{supName},#{price},#{modifyTime}
         )
     </insert>
 
@@ -441,7 +441,7 @@
         (id,
         thirdId,thirdName,uuid,isUseDy,updateTime,modifyTime,
         thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
-        ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price
+        ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price,modifyTime
         )
         values
             (
@@ -472,7 +472,7 @@
         #{udplatCode},
         #{isAdavence},
         #{supName},
-        #{price}
+        #{price},#{modifyTime}
         )
     </insert>
 
@@ -546,7 +546,7 @@
     <insert id="importUdiRelevance" parameterType="java.util.List">
         replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, modifyTime, thirdId1, thirdId2, thirdId3,
         thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory,
-        measname, isDisable, mainId, mainName, udplatCode,supName,price)
+        measname, isDisable, mainId, mainName, udplatCode,supName,price,modifyTime)
         values
         <foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
             (#{item.id},
@@ -571,7 +571,7 @@
             #{item.isDisable},
             #{item.mainId},
             #{item.mainName},
-            #{item.udplatCode},#{item.supName},#{item.price})
+            #{item.udplatCode},#{item.supName},#{item.price},#{modifyTime})
         </foreach>
     </insert>
 </mapper>

api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml

@@ -305,6 +305,27 @@
         group by stock_order_detail.id
     </select>
 
+
+    <select id="listCodePrint" parameterType="com.glxp.api.admin.req.business.StockOrderFilterRequest"
+            resultType="com.glxp.api.admin.entity.business.StockOrderPrintEntity">
+        select io_codes.code udiCode,basic_udirel.id productId,basic_products.cpmctymc productName,basic_products.ggxh
+        spec,io_codes.batchNo,io_codes.produceDate productDate,io_codes.expireDate ,io_codes.serialNo,io_codes.count,
+        basic_products.ylqxzcrbarmc,basic_products.manufactory,basic_udirel.measname,basic_products.zczbhhzbapzbh,
+        inv_warehouse.name locInv,productinfo.spmc, basic_products.cpms
+        from io_codes
+        INNER JOIN basic_udirel on io_codes.relId = basic_udirel.id
+        INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid
+        LEFT JOIN inv_warehouse ON io_codes.locStorageCode = inv_warehouse.`code`
+        left JOIN productinfo on productinfo.uuid = basic_products.originUuid
+        <where>
+            <if test="orderId != '' and orderId !=null">
+                and io_codes.orderId =#{orderId}
+            </if>
+
+        </where>
+        group by io_codes.id
+    </select>
+
     <select id="selectSupplementOrderList" resultType="com.glxp.api.admin.entity.business.StockOrderEntity">
         select *
         from stock_order

api-admin/src/main/resources/mybatis/mapper/info/SystemPDFTemplateRelevanceDao.xml

@@ -16,7 +16,8 @@
         templateId,
         moduleId,
         system_pdf_template.name
-        templateName,system_pdf_template_relevance.remark1,system_pdf_template_relevance.remark2,system_pdf_template_relevance.remark3
+        templateName,system_pdf_template_relevance.remark1,system_pdf_template_relevance.remark2,system_pdf_template_relevance.remark3,
+        printType
         from basic_bustype_local
         LEFT JOIN system_pdf_template_relevance
         on basic_bustype_local.action = system_pdf_template_relevance.localAction
@@ -66,7 +67,7 @@
         insert
         ignore
         INTO system_pdf_template_relevance
-            (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3)
+            (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3,printType)
         values (
         #{templateId},
         #{customerId},
@@ -75,7 +76,8 @@
         #{localAction},
         #{remark1},
         #{remark2},
-        #{remark3}
+        #{remark3},
+        #{printType}
         )
     </insert>
     <update id="udpateRl" parameterType="com.glxp.api.admin.entity.info.SystemPDFTemplateRelevanceEntity">
@@ -89,6 +91,7 @@
             <if test="remark1 != null">remark1=#{remark1},</if>
             <if test="remark2 != null">remark2=#{remark2},</if>
             <if test="remark3 != null">remark3=#{remark3},</if>
+            <if test="printType != null">printType=#{printType},</if>
         </trim>
         WHERE id = #{id}
     </update>