#

whycq

2023-10-07 ec7342d38bb1ca9f5b4e08f4901aa10a3b8d7265

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

@@ -1,5 +1,6 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -14,6 +15,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.dto.WrkDetlWithCheck;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -63,6 +65,7 @@
        }else {
            wrapper.orderBy("io_time", false);
        }
        wrkMastService.selectPage(new Page<>(curr, limit), wrapper);
        return R.ok(wrkMastService.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -123,6 +126,9 @@
    }

    public Boolean juBge(Long wrkSts1,WrkMast wrkMast1){
        if (wrkSts1>20){
            throw new CoolException("大于20的状态不能进行修改！！！");
        }
        switch (wrkMast1.getIoType()){
            case 1:
            case 10:
@@ -142,8 +148,6 @@
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位号状态异常，请维护库位数据");
                        }
                    }
                    return false;
                }else if (wrkSts1>20){
                    return false;
                }
                return true;
@@ -165,8 +169,6 @@
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位号状态异常，请维护库位数据");
                        }
                    }
                    return false;
                }else if (wrkSts1>20){
                    return false;
                }
                return true;
@@ -419,6 +421,7 @@
            wrkDetl.setModiTime(now);
            wrkDetl.setAppeUser(1L);
            wrkDetl.setModiUser(1L);
            wrkDetl.setMatType(locDetl.getMatType());
            wrkDetlService.insert(wrkDetl);

        }