From 57f25dc9d1d3678ea22ae7781e58d37fd152e53d Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Wed, 30 Oct 2024 16:00:16 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/basic/BasicOrderPrintController.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 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 507bfb19c..d4164169b 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java
@@ -150,7 +150,9 @@ public class BasicOrderPrintController {
                     bizData.put("serialNo", udiProductEntity.getSerialNo() == null ? ' ' : udiProductEntity.getSerialNo());
                     bizData.put("productDate", obj.getProductDate());
                     bizData.put("expireDate", obj.getExpireDate());
-                    bizData.put("confirmTime", formatter.format(ioOrderResponse.getConfirmTime()));
+                    if (ioOrderResponse.getConfirmTime() != null){
+                        bizData.put("confirmTime", formatter.format(ioOrderResponse.getConfirmTime()));
+                    }
                     bizData.put("manufactor", obj.getManufacturer());
                     bizData.put("zczbhhzbapzbh", obj.getCertCode() == null ? ' ' : obj.getCertCode());
                     bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
@@ -239,7 +241,9 @@ public class BasicOrderPrintController {
                     bizData.put("serialNo", obj.getSerialNo() == null ? ' ' : obj.getSerialNo());
                     bizData.put("productDate", ioOrderDetailBizEntity.getProductDate());
                     bizData.put("expireDate", ioOrderDetailBizEntity.getExpireDate());
-                    bizData.put("confirmTime", formatter.format(ioOrderResponse.getConfirmTime()));
+                    if (ioOrderResponse.getConfirmTime() != null){
+                        bizData.put("confirmTime", formatter.format(ioOrderResponse.getConfirmTime()));
+                    }
                     bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer());
                     bizData.put("zczbhhzbapzbh", ioOrderDetailBizEntity.getCertCode() == null ? ' ' : ioOrderDetailBizEntity.getCertCode());
                     bizData.put("udiCode", obj.getCode().replaceAll("\u001D", ""));

From ec8b517212935c09bc6daa2b9914444f1a62da2e Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 1 Nov 2024 16:00:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/inout/IoOrderDetailResultDao.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
index b67be7ba3..a7b1d6e8d 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
@@ -174,6 +174,14 @@
 
     <select id="filterOrderDeptSupList" resultType="com.glxp.api.res.inout.IoOrderDetailDeptResultResponse">
         SELECT
+	fromInvCode,
+	fromInvName,
+	fromCorpName,
+	SUM( amount ) AS amount,
+	SUM( count ) AS count
+FROM
+	(
+	SELECT
         aw.code as fromInvCode,
         aw.name as fromInvName,
         IFNULL(bc.name,aw2.name) as fromCorpName,
@@ -231,6 +239,11 @@
             </if>
         </where>
         group by a1.fromInvCode,a1.fromCorp
+        			) t1
+		GROUP BY
+			fromInvCode,
+		fromInvName,
+	fromCorpName
     </select>
 
     <select id="selectStatDataByTime" resultType="com.glxp.api.res.inv.IoOrderDetailStatRsponse">

From 9b3cf386a5c2d6e2a2f4dda1d8e7dcecde77d8af Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 1 Nov 2024 16:48:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/entity/basic/BasicProductsEntity.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java
index cbb1cc3d1..ca12b73cc 100644
--- a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java
@@ -381,6 +381,14 @@ public class BasicProductsEntity {
     private String matrial;
 
 
+    /**
+     * 是否需要收费 1是；0否
+     */
+    @TableField(value = "requireCost")
+    @ApiModelProperty(value="是否需要收费 1是；0否")
+    private String requireCost;
+
+
 
     /**
      * 包装规格