Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -470,20 +470,15 @@ public class IoOrderDetailBizController extends BaseController {
 
 
     @PostMapping("/udiwms/inout/biz/insertInvoice")
-    public BaseResponse insertInvoice(@RequestBody List<IoOrderDetailResultEntity> list) {
-        if (CollUtil.isEmpty(list)) {
-            return ResultVOUtils.error(500, "请选入产品！");
-        }
-        for (IoOrderDetailResultEntity ioOrderDetailResultEntity : list) {
+    public BaseResponse insertInvoice(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) {
+
             IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity();
-            ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailResultEntity.getOrderIdFk());
-            ioOrderInvoiceEntity.setBindRlFk(ioOrderDetailResultEntity.getBindRlFk() + "");
-            ioOrderInvoiceEntity.setBatchNo(ioOrderDetailResultEntity.getBatchNo());
-            ioOrderInvoiceEntity.setProductDate(ioOrderDetailResultEntity.getProductDate());
-            ioOrderInvoiceEntity.setExpireDate(ioOrderDetailResultEntity.getExpireDate());
+            ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailBizEntity.getOrderIdFk());
+            ioOrderInvoiceEntity.setBindRlFk(ioOrderDetailBizEntity.getBindRlFk() + "");
+            ioOrderInvoiceEntity.setBatchNo(ioOrderDetailBizEntity.getBatchNo());
+            ioOrderInvoiceEntity.setProductDate(ioOrderDetailBizEntity.getProductDate());
+            ioOrderInvoiceEntity.setExpireDate(ioOrderDetailBizEntity.getExpireDate());
             boolean b = ioOrderInvoiceService.insertInvoice(ioOrderInvoiceEntity);
-        }
-
 
         return ResultVOUtils.success("成功");
 

src/main/java/com/glxp/api/controller/purchase/SupCertController.java

@@ -529,7 +529,6 @@ public class SupCertController {
     //首营预览文件
     @PostMapping("/udiwms/image/register/file")
     public BaseResponse uploadRegisterFile(@RequestBody FilterImageRequest filterImageRequest) {
-
         List<String> urlList=Arrays.asList(filterImageRequest.getImageUrl().split(","));
         List<String> list = new ArrayList<>();
        for (String obj:urlList){

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

@@ -38,6 +38,6 @@
                 AND ic.orderIdFk = #{orderIdFk}
             </if>
         </where>
-        GROUP BY ic.bindRlFk,ic.batchNo
+        GROUP BY ic.id
     </select>
 </mapper>