1

zhang

昨天 2ee6aabfa6a557939dfae393c4881b8b5b9ea270

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -7,10 +7,13 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.OutLocInfoParam;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.OpenService;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
@@ -33,6 +36,9 @@

    @Autowired
    private OpenService openService;

    @Autowired
    private LocDetlMapper locDetlMapper;

    @PostMapping("/scrk")
    @AppAuth(memo = "GWMS调用生成入库工作档")
@@ -503,15 +509,34 @@
    }

    /**
     * 退库单（出库）
     * 是否合格
     */
    @PostMapping("/unqualifiedOrder/auth/v1")
    @AppAuth(memo = "不合格品退库单单据下发")
    public synchronized R unqualifiedOrder(@RequestHeader(required = false) String appkey,
                                      @RequestBody ReturnOrderConfirmParam param,
    @PostMapping("/check/auth/v1")
    @AppAuth(memo = "检验是否合格")
    @Transactional
    public synchronized R check(@RequestHeader(required = false) String appkey,
                                      @RequestBody UnQualifiedOrderConfirmParam param,
                                      HttpServletRequest request) {
        auth(appkey, param, request);
        openService.unqualifiedOrder(param);
        List<UnQualifiedOrderConfirmParam.VolumeNumber> volumeNumbers = param.getVolumeNumbers();
        for (UnQualifiedOrderConfirmParam.VolumeNumber v :volumeNumbers){
            if (!Cools.isEmpty(v.getVolumeNumber())&&!Cools.isEmpty(param.getQualified())){
                locDetlMapper.updateQualifiedByBrand(v.getVolumeNumber(), param.getQualified(),param.getRemark());
            }
        }
        return R.ok(param);
    }

    /**
     * 退库单（出库）
     */
    @PostMapping("/unQualifiedOrder/auth/v1")
    @AppAuth(memo = "不合格品退库单单据下发")
    public synchronized R unqualifiedOrder(@RequestHeader(required = false) String appkey,
                                           @RequestBody UnQualifiedOrderConfirmParam param,
                                           HttpServletRequest request) {
        auth(appkey, param, request);
        openService.unQualifiedOrder(param);
        return R.ok(param);
    }