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;
@@ -94,6 +95,7 @@
            }else {
                wrkMast.setWrkSts(14L);
            }
            wrkMast.setModiTime(new Date());
            if (!wrkMastService.updateById(wrkMast)){
                return R.error("更新失败");
            }
@@ -104,7 +106,6 @@

        return R.ok();
    }



    @PostMapping("/locDetl/select/time/v1")
@@ -144,7 +145,6 @@

        return R.ok();
    }



    /****************************************************************************/
@@ -266,8 +266,6 @@
                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);