修改新购入库接口

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmQrBoxController.java

@@ -168,7 +168,7 @@ public class BmQrBoxController extends BaseController {
      * APP -- 新购入库 -- 确认入库标准箱
      */
     @ApiOperation(value = "APP -- 新购入库 -- 标准箱直接扫描入库")
-    @PreventRepeatSubmit
+
     //@RequiresPermissions("basic:qrBox:edit")
     @SysLog(title = "APP-二维码标准箱入库", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->APP扫码创建标准箱")
     @PostMapping("/app_box_input")

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/dto/BoxBindWarehouseDto.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+
 /**
  * @author : 阮世耀
  * @version : 1.0
@@ -35,4 +37,6 @@ public class BoxBindWarehouseDto {
 
     @ApiModelProperty(value = "机具状态")
     private String maStatus;
+    @ApiModelProperty(value = "入库数量")
+    private BigDecimal inputNum;
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java

@@ -569,7 +569,9 @@ public class BmQrBoxServiceImpl implements BmQrBoxService {
             List<BoxBindWarehouseDto> boxList = bmQrBoxMapper.getBoxList(boxBindWarehouseDto);
             for (BoxBindWarehouseDto  boxMa: boxList) {
                 //1.验证标准箱里的机具是否待入库
-                if (!MaMachineStatusEnum.NEW_PURCHASE.equals(boxMa.getMaStatus())) {
+                if ("0".equals(boxMa.getMaStatus())) {
+
+                }else{
                     return AjaxResult.error(String.format("标准箱里%s状态异常，请检查后重新提交!", boxMa.getMaStatus()));
                 }
                 //2.修改新购入库数量,    //2.5.修改入库任务状态

bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml

@@ -348,7 +348,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <update id="updateNewInputNum">
-        update purchase_check_details set input_num = ifnull(input_num) + 1 where task_id = #{taskId} and type_id = #{maTypeId}
+        update purchase_check_details set input_num = IFNULL(input_num,0)  + 1 where task_id = #{taskId} and type_id = #{maTypeId}
     </update>
 
 
@@ -384,11 +384,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <update id="updateTaskStatus">
-        UPDATE tm_task SET status = 22 WHERE task_id = #{taskId}
+        UPDATE tm_task SET task_status = 22 WHERE task_id = #{taskId}
     </update>
 
     <update id="updateStorageNum">
-        update ma_type set storage_num = storage_num + #{inputNum} where type_id = #{typeId}
+        update ma_type set storage_num = storage_num + #{inputNum} where type_id = #{maTypeId}
     </update>
 
     <update id="updateBoxStatus">