修复Loc_mast导出问题

野心家

2024-01-24 b931c44bee33ccae4d14594a6419bcf0a26b29dd

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

@@ -12,9 +12,11 @@
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.entity.Parameter;
import com.zy.common.model.Shelves;
import com.zy.common.web.BaseController;
@@ -39,6 +41,8 @@
    private Integer equipmentCount;
    @Value("${channel.channelMax}")
    private Integer channelMax;
    @Autowired
    private WrkMastService wrkMastService;

    @RequestMapping(value = "/locMast/init/pwd")
    public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -82,7 +86,11 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
                if (entry.getKey().equals("loc_type1")){
                    wrapper.eq(entry.getKey(), val);
                }else {
                    wrapper.like(entry.getKey(), val);
                }
            }
        }
    }
@@ -101,6 +109,18 @@
   @RequestMapping(value = "/locMast/update/auth")
   @ManagerAuth(memo = "库位修改")
    public R update(LocMast locMast){
        LocMast locMast1 = locMastService.selectById(locMast.getLocNo());
        if (locMast.getLocType1()==0){
            locMast.setLocType1(locMast1.getLocType1());
        }
        if (!locMast1.getLocType1().equals(locMast.getLocType1())){
            if (locMast.getRow1()!=2){
                return R.error("当前操作已被阻止，只允许第二排库位修改库位类型！！！");
            }
            if (locMast1.getLocType1()==1){
                return R.error("当前操作已被阻止，测试库位禁止修改库位类型！！！");
            }
        }
        if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
            return R.error();
        }
@@ -113,6 +133,11 @@
            if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
                locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
            }
        }
        if(locMast.getFreeze()==1&&locMast.getPackStatus()==6){
            locMast.setPackStatus(5);
            locMast.setLocSts("F");
            wrkMastService.delete(new EntityWrapper<WrkMast>().eq("source_loc_no",locMast.getLocNo()));
        }
        locMast.setModiUser(getUserId());
        locMast.setModiTime(new Date());
@@ -197,20 +222,20 @@
                    locMast.setBay1(b); // 列
                    locMast.setLev1(l); // 层
                    locMast.setCrnNo(crnNo); // 堆垛机
                    locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
                    locMast.setLocType2(param.getLocType2());
                    locMast.setLocType3(param.getLocType3());
                    locMast.setLocType1((short)0);
                    locMast.setLocType2((short)0);
                    locMast.setLocType3((short)0);
                    locMast.setAppeUser(getUserId());
                    locMast.setAppeTime(now);
                    locMast.setModiUser(getUserId());
                    locMast.setModiTime(now);
                    if (r==equipmentRow){
                    if (r==equipmentRow && b<3){
                        locMast.setChannel(l+(b-2)*param.getEndLev());
                        locMast.setLocType1((short)1);
                        int i = (locMast.getChannel() - 1) / (channelMax / equipmentCount) + 1;
                        locMast.setLocType2((short)i);
                    }
                    if (r==quietRow){
                    if (r==quietRow && b<3){
                        locMast.setLocType1((short)2);
                    }
                    list.add(locMast);