Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo

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());
+                    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());
+                    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", ""));

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;
+
+
 
     /**
      * 包装规格

src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml

@@ -173,6 +173,14 @@
     </select>
 
     <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,
@@ -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">