#

野心家

2023-09-06 1d94f7aca37aee361786b67ceb65920192f4f7ca

#

 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) {
@@ -118,6 +122,11 @@
                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());
        locMastService.updateById(locMast);

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -836,7 +836,7 @@
    @Transactional
    public List<PackUsageRate> packUsageRate() {
        ArrayList<PackUsageRate> packUsageRates = new ArrayList<>();
        for (int i = 0 ;i<5;i++){
        for (int i = 1 ;i<5;i++){
            PackUsageRate packUsageRate = new PackUsageRate();
            packUsageRate.setTotal(locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_type1", i)));
            packUsageRate.setCurrentQuantity(locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_type1", i).and().ne("loc_sts","O")));