第六排成品可以放第七排原材料

dubin

2025-12-19 b00eeab31bd13ba34a03301aa441b0751d6a93e4

 src/main/java/com/zy/ints/controller/WaitMatinController.java

@@ -36,16 +36,29 @@
    public R headPage(@RequestParam(defaultValue = "1")Integer curr,
                      @RequestParam(defaultValue = "10")Integer limit,
                      @RequestParam Map<String, Object> param){
        if (!Cools.isEmpty(param.get("modi_time"))){
            String val = String.valueOf(param.get("modi_time"));
        if (!Cools.isEmpty(param.get("appe_time"))){
            String val = String.valueOf(param.get("appe_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");
                param.remove("appe_time");
            }
        }
        return R.ok(waitMatinService.getHeadPage(toPage(curr, limit, param, WaitMatin.class)));
    }

    @RequestMapping(value = "/waitMatin/detl/list/auth")
    @ManagerAuth
    public R detlPage(@RequestParam String billNo){
        if (Cools.isEmpty(billNo)){
            return R.parse(BaseRes.PARAM);
        }
        List<WaitMatin> waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", billNo));
        if (Cools.isEmpty(waitMatins)) {
            return R.parse(BaseRes.EMPTY);
        }
        return R.ok().add(waitMatins);
    }


@@ -117,6 +130,9 @@
        if (Cools.isEmpty(waitMatins)) {
            return R.parse(BaseRes.PARAM);
        }
        if (waitMatinService.selectCount(new EntityWrapper<WaitMatin>().eq("bill_no", waitMatins.get(0).getBillNo())) > 0) {
            return R.error("单据编号已存在");
        }
        int i = 1;
        Date now = new Date();
        for (WaitMatin waitMatin : waitMatins) {
@@ -133,14 +149,33 @@
        return R.ok("添加成功");
    }

   @RequestMapping(value = "/waitMatin/update/auth")
   @RequestMapping(value = "/waitMatin/modify/auth")
   @ManagerAuth
    public R update(WaitMatin waitMatin){
        if (Cools.isEmpty(waitMatin) || null==waitMatin.getSeqNo()){
    @Transactional
    public R update(@RequestBody List<WaitMatin> waitMatins){
        if (Cools.isEmpty(waitMatins)) {
            return R.parse(BaseRes.PARAM);
        }
        Date now = new Date();
        List<WaitMatin> oldWaitMatin = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", waitMatins.get(0).getBillNo()));
        Date appeTime = oldWaitMatin!=null?oldWaitMatin.get(0).getAppeTime():now;
        Long appeUser = oldWaitMatin!=null?oldWaitMatin.get(0).getAppeUser():getUserId();
        if (!waitMatinService.delete(new EntityWrapper<WaitMatin>().eq("bill_no", waitMatins.get(0).getBillNo()))) {
            return R.error();
        }
        waitMatinService.updateById(waitMatin);
        return R.ok();
        int i = 1;
        for (WaitMatin waitMatin : waitMatins) {
            waitMatin.setSeqNo(i);
            waitMatin.setAppeTime(appeTime);
            waitMatin.setAppeUser(appeUser);
            waitMatin.setModiTime(now);
            waitMatin.setModiUser(getUserId());
            if (!waitMatinService.insert(waitMatin)) {
                throw new CoolException("修改单据明细失败");
            }
            i++;
        }
        return R.ok("修改成功");
    }

    @RequestMapping(value = "/waitMatin/delete/auth")