*

lsh

昨天 27272b02ddf69e6b82c8c9ae00799d0b54f2044c

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

@@ -2,6 +2,7 @@

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -15,12 +16,18 @@
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.param.OrderInspectionRollParam;
import com.zy.asrs.entity.param.QualityGroupListParam;
import com.zy.asrs.entity.result.OrderPakoutDetailVo;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
@@ -38,6 +45,13 @@
    private LocDetlMapper locDetlMapper;
    @Autowired
    private MatService matService;
    @Autowired
    private ApiLogService apiLogService;

    @Value("${srXghyMes.qualityFinishedCheckoutUrl}")
    private String qualityFinishedCheckoutUrl;
    @Value("${srXghyMes.qualityFinishedCheckout}")
    private String qualityFinishedCheckout;

    @RequestMapping(value = "/locDetl/update")
    public R update1() {
@@ -83,10 +97,36 @@
                param.remove("modi_time");
            }
        }
        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
        Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
        if (stockOut.getRecords().size()==0){
            stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
        }
        return R.ok(stockOut);
    }

    @RequestMapping(value = "/error/locDetl/list/auth")// /locDetl/list/auth 接口问题
    @RequestMapping(value = "/unqualified/stock/out/list/auth")
    @ManagerAuth
    public R stockOutListUnqualified(@RequestParam(defaultValue = "1")Integer curr,
                          @RequestParam(defaultValue = "10")Integer limit,
                          @RequestParam Map<String, Object> param){
        param.put("danger",2);
        if (!Cools.isEmpty(param.get("modi_time"))){
            String val = String.valueOf(param.get("modi_time"));
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                param.put("startTime", DateUtils.convert(dates[0]));
                param.put("endTime", DateUtils.convert(dates[1]));
                param.remove("modi_time");
            }
        }
        Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
        if (stockOut.getRecords().size()==0){
            stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
        }
        return R.ok(stockOut);
    }

    @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 接口问题
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
@@ -149,12 +189,18 @@
   @RequestMapping(value = "/locDetl/update/auth")
   @ManagerAuth(memo = "库位明细修改")
    public R update(LocDetl locDetl){
        if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
        if (Cools.isEmpty(locDetl) || null==locDetl.getBatch()){
            return R.error();
        }
        locDetl.setModiUser(getUserId());
        locDetl.setModiTime(new Date());
        locDetlService.updateById(locDetl);
        LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locDetl.getLocNo()).eq("batch", locDetl.getBatch()));
        if (Cools.isEmpty(locDetl1) ){
            return R.error();
        }
        locDetl1.setModiUser(getUserId());
        locDetl1.setModiTime(new Date());
        locDetl1.setDanger(locDetl.getDanger());
        locDetlService.update(locDetl1,new EntityWrapper<LocDetl>().eq("loc_no", locDetl.getLocNo()).eq("batch", locDetl.getBatch()));
//        locDetlService.updateById(locDetl1);
        return R.ok();
    }

@@ -271,4 +317,72 @@
        return R.ok(sum);
    }

    @RequestMapping(value = "/actual/shipment/locDetl/report/auth")
    @ManagerAuth(memo = "卷号是否合格手动校验")
    public R actualShipmentLocDetl(@RequestParam String model) {
        Long userId = null;
        try {
            userId = getUserId();
            if (Cools.isEmpty(userId)) {
                return R.error("用户异常").add("用户异常");
            }
        } catch (Exception e){
            return R.error("用户异常").add("用户异常");
        }
        List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("model", model));
//        OrderInspectionRollParam orderInspectionRollParam = new OrderInspectionRollParam(model);
        String response = "";
        boolean success = false;
        Map<String, Object> params = new HashMap<>();
        params.put("batchNo", model);
        try {
            response = new HttpHandler.Builder()
                    .setUri(qualityFinishedCheckoutUrl)
                    .setPath(qualityFinishedCheckout)
                    .setParams(params)
                    .setUseFormUrlEncoded(true)
                    .build()
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);
            if (jsonObject.getBoolean("state")) {
                String value = jsonObject.getString("value");
                if (value.equals("合格")){
                    for (LocDetl locDetl : locDetlList) {
                        locDetl.setDanger(1);
                        locDetlService.updateById(locDetl);
                    }
                } else if (value.equals("不合格")){
                    for (LocDetl locDetl : locDetlList) {
                        locDetl.setDanger(2);
                        locDetlService.updateById(locDetl);
                    }
                } else {
                    for (LocDetl locDetl : locDetlList) {
                        locDetl.setDanger(0);
                        locDetlService.updateById(locDetl);
                    }
                }
                success = true;
            } else {
                return R.error("查询卷号是否合格失败");
            }
        } catch (Exception e) {
            return R.error("查询卷号是否合格失败"+e.getMessage());
        } finally {
            try {
                // 保存接口日志
                apiLogService.save(
                        "查询卷号是否合格",
                        qualityFinishedCheckoutUrl+"/"+qualityFinishedCheckout,
                        null,
                        "127.0.0.1",
                        JSON.toJSONString(params),
                        response,
                        success
                );
            } catch (Exception e) { }
        }
        return R.error("上报失败").add("上报失败");
    }

}