*

L

2 天以前 7e68f81b38116bba40e70620c563168fcde66a37

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

@@ -15,6 +15,7 @@
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.impl.LocMastServiceImpl;
import com.zy.asrs.utils.CodeDetectionUtil;
import com.zy.asrs.utils.LocFCSUtils;
import com.zy.common.web.BaseController;
import com.zy.core.CrnThread;
import com.zy.core.cache.CrnErrCache;
@@ -121,23 +122,38 @@


            if (Cools.isEmpty(basCrnpParam.getLocMastDemoCount()) || basCrnpParam.getLocMastDemoCount()<1){
                return R.error("请输入测试库位数量").add("请输入测试库位数量");
                return R.error("请输入测试在库库位数量").add("请输入测试在库库位数量");
            }
            if (Cools.isEmpty(basCrnpParam.getLocMastDemo())){
                return R.error("请输入测试库位列表").add("请输入测试库位列表");
            if (Cools.isEmpty(basCrnpParam.getLocMastDemoF())){
                return R.error("请输入测试在库库位列表").add("请输入测试在库库位列表");
            } else {
                String[] split = basCrnpParam.getLocMastDemo().split(";");
                String[] split = basCrnpParam.getLocMastDemoF().split(";");
                if (split.length!=basCrnpParam.getLocMastDemoCount()){
                    return R.error("输入测试库位列表数量不匹配").add("输入测试库位列表数量不匹配");
                    return R.error("输入测试在库库位列表数量不匹配").add("输入测试在库库位列表数量不匹配");
                }
                basCrnpParam.setLocMastDemoList(new ArrayList<>(Arrays.asList(split)));
                for (String locNo : basCrnpParam.getLocMastDemoList()){
                basCrnpParam.setLocMastDemoListF(new ArrayList<>(Arrays.asList(split)));
                for (String locNo : basCrnpParam.getLocMastDemoListF()){
                    boolean locNoDetection = CodeDetectionUtil.locNoDetection(locNo);
                    if (!locNoDetection){
                        return R.error("输入测试库位异常").add("输入测试库位异常");
                        return R.error("输入测试在库库位异常").add("输入测试在库库位异常");
                    }
                }
            }
//            if (Cools.isEmpty(basCrnpParam.getLocMastDemoE())){
//                return R.error("请输入测试空库位列表").add("请输入测试空库位列表");
//            } else {
//                String[] split = basCrnpParam.getLocMastDemoE().split(";");
//                if (split.length!=basCrnpParam.getLocMastDemoCount()){
//                    return R.error("输入测试空库位列表数量不匹配").add("输入测试空库位列表数量不匹配");
//                }
//                basCrnpParam.setLocMastDemoListE(new ArrayList<>(Arrays.asList(split)));
//                for (String locNo : basCrnpParam.getLocMastDemoListE()){
//                    boolean locNoDetection = CodeDetectionUtil.locNoDetection(locNo);
//                    if (!locNoDetection){
//                        return R.error("输入测试空库位异常").add("输入测试空库位异常");
//                    }
//                }
//            }

            if (Cools.isEmpty(basCrnpParam.getStaOutDemo())){
                return R.error("请输入测试出库站").add("请输入测试出库站");
@@ -182,9 +198,18 @@
                }
            }
            crnProtocol.setLocMastDemoCount(basCrnpParam.getLocMastDemoCount());
            crnProtocol.setLocMastDemoList(basCrnpParam.getLocMastDemoList());
            crnProtocol.setLocMastDemoListF(basCrnpParam.getLocMastDemoListF());
            ArrayList<String[]> locS = LocFCSUtils.getLocS(basCrnpParam.getLocMastDemoListF());

//            crnProtocol.setLocMastDemoListE(basCrnpParam.getLocMastDemoListE());
            ArrayList<String> locMastDemoList = new ArrayList<>();
            locMastDemoList.addAll(basCrnpParam.getLocMastDemoListF());
//            locMastDemoList.addAll(basCrnpParam.getLocMastDemoListF());
            crnProtocol.setLocMastDemoList(locMastDemoList);
            crnProtocol.setLocMastDemoListSign(locS);
            crnProtocol.setStaOutDemo(basCrnpParam.getStaOutDemo());
            crnProtocol.setStaIntDemo(basCrnpParam.getStaIntDemo());
            crnProtocol.setSignIntOut(false);
        }
        basCrnp.setHpMk(basCrnpParam.getHpMk());
        basCrnp.setModiUser(getUserId());