From eaae5e53dc85c8e993ba622af4a4ec83b3dbb3c5 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 23 Dec 2024 20:59:07 +0800
Subject: [PATCH] =?UTF-8?q?12/23=20=E5=8D=95=E6=8D=AE=E6=89=93=E5=8D=B0?=
=?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=AE=A1=E6=A0=B8=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=AF=A6=E6=83=85=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../basic/BasicOrderPrintController.java | 7 ++++++-
.../mapper/inout/IoOrderDetailBizDao.xml | 19 +++++--------------
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java
index a1b924e0..6f099420 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java
@@ -13,6 +13,7 @@ import com.glxp.api.entity.basic.UdiProductEntity;
import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.entity.inout.IoCodeEntity;
import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
+import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
import com.glxp.api.entity.system.*;
import com.glxp.api.entity.thrsys.ThrProductsEntity;
@@ -122,8 +123,10 @@ public class BasicOrderPrintController {
//根据批次号打印
if (basicBussinessTypeEntity.getOrderVisibleType() == 0) {
//查询单据表
+ IoOrderEntity byBillNo = ioOrderService.findByBillNo(filterOrderPrintRequest.getOrderIdFk());
FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
filterOrderRequest.setBillNo(filterOrderPrintRequest.getOrderIdFk());
+ filterOrderRequest.setProductType(byBillNo.getProductType());
IoOrderResponse ioOrderResponse = ioOrderService.filterList(filterOrderRequest).get(0);
@@ -151,7 +154,9 @@ public class BasicOrderPrintController {
bizData.put("remark2", sysPdfTemplateRelevanceCodeEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark2());
bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms());
bizData.put("spmc", obj.getCoName() == null ? ' ' : obj.getCoName());
- bizData.put("spec", obj.getSpec() == null ? ' ' : obj.getSpec());
+ if (udiProductEntity.getProductsType() == 2){
+ bizData.put("spec", udiProductEntity.getPrepnSpec() == null ? ' ' : udiProductEntity.getPrepnSpec());
+ }
bizData.put("count", obj.getCount());
bizData.put("measname", obj.getMeasname() == null ? ' ' : obj.getMeasname());
bizData.put("price", obj.getPrice() == null ? '0' : obj.getPrice());
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
index 72dcaab3..b51fd8d3 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
@@ -194,21 +194,12 @@
<select id="getCount" resultType="java.lang.Integer">
select count(*)
from io_order_detail_biz
- left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
- left join basic_products bp on bu.uuid = bp.uuid
<where>
- <if test="orderIdFk!= null and orderIdFk!= ''">
- AND orderIdFk = #{orderIdFk}
- </if>
- <if test="relId!= null">
- AND bindRlFk = #{relId}
- </if>
- <if test="batchNo!= null and batchNo!= ''">
- AND batchNo = #{batchNo}
- </if>
- <if test="productName!= null and productName!= ''">
- AND bp.cpmctymc like concat('%', #{productName}, '%')
- </if>
+ <if test="orderIdFk != null and orderIdFk != ''">
+ AND orderIdFk = #{orderIdFk}
+ </if>
</where>
</select>
+
+
</mapper>