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

src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java

@@ -139,6 +139,7 @@ public class BasicOrderPrintController {
                         for (IoOrderInvoiceResponse respons : ioOrderInvoiceResponses) {
                             encode+=respons.getInvoiceEncode()+",";
                         }
+                        encode = encode.substring(0,encode.length()-1);
                         bizData.put("invoiceEncode", encode == null ? ' ' : encode);
                         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                         String dateStr = sdf.format(ioOrderInvoiceResponses.get(0).getCreateTime());
@@ -200,6 +201,7 @@ public class BasicOrderPrintController {
                         for (IoOrderInvoiceResponse respons : ioOrderInvoiceResponses) {
                             encode+=respons.getInvoiceEncode()+",";
                         }
+                        encode = encode.substring(0,encode.length()-1);
                         bizData.put("invoiceEncode", encode == null ? ' ' : encode);
                         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                         String dateStr = sdf.format(ioOrderInvoiceResponses.get(0).getCreateTime());

src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java

@@ -182,8 +182,8 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
         }
         List<InvProductDetailEntity> datas =
                 invProductDetailDao.selectList(new QueryWrapper<InvProductDetailEntity>().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
-                                .and(i-> i.isNull(StrUtil.isEmpty(batchNo), "batchNo").or().eq("batchNo","")).eq(StrUtil.isNotEmpty(supId), "supId", supId).eq("deptCode", deptCode).eq("invCode", invCode)
-                        .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode)
+                       .eq(StrUtil.isNotEmpty(supId), "supId", supId).eq("deptCode", deptCode).eq("invCode", invCode)
+                        .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode) .isNull(StrUtil.isEmpty(batchNo), "batchNo").or().eq(StrUtil.isEmpty(batchNo),"batchNo","")
                 );
 
         int count = 0;

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

@@ -20,6 +20,7 @@
                 AND code = #{code}
             </if>
         </where>
+        GROUP BY ic.id
     </select>
 
     <select id="selectExitCount" resultType="java.lang.Integer">