新购绑定

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java

@@ -89,7 +89,7 @@ public class PurchaseBindController extends BaseController {
     @ApiOperation(value = "二维码生成下载")
     @PostMapping(value = "/downloadQrCode")
     @PreventRepeatSubmit
-    //@RequiresPermissions("purchase:bind:download")
+    @RequiresPermissions("purchase:bind:download")
     public void downloadQrCode(HttpServletResponse response, PurchaseDto purchaseDto) {
         purchaseBindService.downloadQrCode(response, purchaseDto);
     }

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseBindMapper.java

@@ -80,4 +80,12 @@ public interface PurchaseBindMapper {
      * @param purchaseId
      */
     void updateStatusById(@Param("updatedStatus") Integer updatedStatus, @Param("id") String purchaseId);
+
+    /**
+     * 更新数量
+     * @param dto
+     * @param num
+     * @return
+     */
+    int updateNum(@Param("dto") PurchaseDto dto, @Param("num") int num);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java

@@ -154,8 +154,20 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService {
             purchaseDto.setCreateTime(DateUtils.getNowDate());
             purchaseDto.setTaskId(dto.getTaskId());
             purchaseDto.setTypeId(dto.getTypeId());
+            purchaseDto.setStatus(0);
             result += purchaseBindMapper.add(purchaseDto);
         }
+        //根据前端传参更新绑定数量
+        result += purchaseBindMapper.updateNum(dto, dto.getDtoList().size());
+        //根据任务id和类型id查询状态
+        List<PurchaseVo> voList = purchaseBindMapper.selectPurchaseCheckInfoById(dto);
+        if (CollectionUtils.isNotEmpty(voList)) {
+            for (PurchaseVo purchaseVo : voList) {
+                if (purchaseVo.getBindNum().equals(purchaseVo.getCheckNum())) {
+
+                }
+            }
+        }
         if (result > 0) {
             return AjaxResult.success("绑定成功");
         }

bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml

@@ -88,9 +88,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="updateNum">
         UPDATE purchase_check_details
-        SET input_num = #{purchaseNum}
+        SET bind_num = bind_num + COALESCE(#{num}, 0)
-        WHERE
+        WHERE task_id = #{dto.taskId}
-            id = #{id}
+          AND type_id = #{dto.typeId}
+          AND #{num} IS NOT NULL
     </update>
 
     <update id="updateStatusById">
@@ -171,6 +172,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             pcd.production_time AS productDate,
             pm.qr_code AS qrCode,
             pm.qr_url AS qrUrl,
+            pcd.check_num AS purchaseNum,
+            pcd.check_num AS checkNum,
+            pcd.bind_num AS bindNum,
             pcd.status AS status
         FROM
             purchase_macode_info pm
@@ -245,7 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             purchase_macode_info
         WHERE
-            DATE_FORMAT(create_time, '%Y-%m') = #{genMonth}
+            DATE_FORMAT(create_time, '%Y-%m') = #{genMonth} and ma_code is not null
         ORDER BY
             qr_code DESC
     </select>