1

zhangc

2025-04-19 8d4540dcd0c3242474538cd8760723b9fe36c308

1

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

@@ -3,13 +3,14 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,8 +43,8 @@
    @GetMapping("/order/delete/v1")
    @AppAuth(memo = "订单信息删除")
    public synchronized R orderDelete(@RequestHeader(required = false) String appkey,
                                  @RequestParam String orderNo,
                                  HttpServletRequest request) {
                                      @RequestParam String orderNo,
                                      HttpServletRequest request) {
        auth(appkey, orderNo, request);
        if (Cools.isEmpty(orderNo)) {
            return R.parse(BaseRes.PARAM);
@@ -57,15 +58,15 @@
    @PostMapping("/tagSync/v1")
    @AppAuth(memo = "物料分类同步")
    public synchronized R tagSync(@RequestHeader(required = false) String appkey,
                                        @RequestBody(required = false) List<Map<String,String>> param,
                                        HttpServletRequest request) {
                                  @RequestBody(required = false) List<Map<String, String>> param,
                                  HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        ArrayList<TagParam> params = new ArrayList<>();
        for (Map<String,String> map : param) {
            TagParam tagParam  = new TagParam(map);
        for (Map<String, String> map : param) {
            TagParam tagParam = new TagParam(map);
            params.add(tagParam);
        }

@@ -85,26 +86,26 @@
            return R.parse(BaseRes.PARAM);
        }
        try {
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getSuperTaskNo()).eq("crn_no",7));
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getSuperTaskNo()).eq("crn_no", 7));
            if (Cools.isEmpty(wrkMast)) {
                throw new CoolException("四向库任务未找到");
            }
            if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10|| wrkMast.getIoType() == 11 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 57) {
            if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 11 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 57) {
                wrkMast.setWrkSts(4L);
            }else {
            } else {
                wrkMast.setWrkSts(14L);
            }
            if (!wrkMastService.updateById(wrkMast)){
            wrkMast.setModiTime(new Date());
            if (!wrkMastService.updateById(wrkMast)) {
                return R.error("更新失败");
            }
        }catch (Exception e) {
        } catch (Exception e) {
            throw new CoolException(e);
        }


        return R.ok();
    }



    @PostMapping("/locDetl/select/time/v1")
@@ -123,7 +124,7 @@
    @AppAuth(memo = "商品信息同步接口")
    public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) MatSyncParam param,
                                      HttpServletRequest request){
                                      HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
@@ -135,8 +136,8 @@
    @PostMapping("/orderSync/default/v1")
    @AppAuth(memo = "订单信息同步接口")
    public synchronized R syncOrderInfo(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) GTOrderParam param,
                                      HttpServletRequest request){
                                        @RequestBody(required = false) GTOrderParam param,
                                        HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
@@ -144,7 +145,6 @@

        return R.ok();
    }



    /****************************************************************************/
@@ -253,21 +253,19 @@
        return R.ok().add(openService.queryStock());
    }

        private void auth(String appkey, Object obj, HttpServletRequest request) {
            log.info("{}接口被访问；appkey:{}；请求数据：{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
            request.setAttribute("cache", obj);
            if (!auth) {
                return;
            }
            if (Cools.isEmpty(appkey)) {
                throw new CoolException("认证失败，请确认appkey无误！");
            }
            if (!APP_KEY_LIST.contains(appkey)) {
                throw new CoolException("认证失败，请确认appkey无误！");
            }
    private void auth(String appkey, Object obj, HttpServletRequest request) {
        log.info("{}接口被访问；appkey:{}；请求数据：{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
        request.setAttribute("cache", obj);
        if (!auth) {
            return;
        }


        if (Cools.isEmpty(appkey)) {
            throw new CoolException("认证失败，请确认appkey无误！");
        }
        if (!APP_KEY_LIST.contains(appkey)) {
            throw new CoolException("认证失败，请确认appkey无误！");
        }
    }


    /**

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -40,13 +40,13 @@
    @Autowired
    private OrderDetlService orderDetlService;

    private static final Map<Integer,Integer> sourceSite = new HashMap<>();
    static {
        sourceSite.put(1041,1040);sourceSite.put(1042,1040);
        sourceSite.put(2011,2010);sourceSite.put(2012,2010);
        sourceSite.put(2001,2000);sourceSite.put(2002,2000);
        sourceSite.put(3011,3010);sourceSite.put(3010,1040);
    }
//    private static final Map<Integer,Integer> sourceSite = new HashMap<>();
//    static {
//        sourceSite.put(1041,1040);sourceSite.put(1042,1040);
//        sourceSite.put(2011,2010);sourceSite.put(2012,2010);
//        sourceSite.put(2001,2000);sourceSite.put(2002,2000);
//        sourceSite.put(3011,3010);sourceSite.put(3010,1040);
//    }

    public ReturnT<String> start(WrkMast wrkMast) {
        // 4.入库完成
@@ -348,13 +348,13 @@
            }

            // 更新入库站点的入库暂存数
            int sourceStaNo = wrkMast.getSourceStaNo() == null ? 0 : wrkMast.getSourceStaNo();
            if (sourceSite.get(sourceStaNo) != null) {
                BasDevpMapper basDevpMapper = SpringUtils.getBean(BasDevpMapper.class);
                BasDevp basDevp = basDevpMapper.selectById(sourceSite.get(sourceStaNo));
                basDevp.setInQty(basDevp.getInQty() -1);
                basDevpMapper.updateById(basDevp);
            }
           // int sourceStaNo = wrkMast.getSourceStaNo() == null ? 0 : wrkMast.getSourceStaNo();
//            if (sourceSite.get(sourceStaNo) != null) {
//                BasDevpMapper basDevpMapper = SpringUtils.getBean(BasDevpMapper.class);
//                BasDevp basDevp = basDevpMapper.selectById(sourceSite.get(sourceStaNo));
//                basDevp.setInQty(basDevp.getInQty() -1);
//                basDevpMapper.updateById(basDevp);
//            }

            // 修改工作主档状态
            wrkMast.setWrkSts(5L);