#1

dubin

2025-11-06 9716f3990efc8319fb8db3736b34481fac09a971

#1

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

@@ -160,6 +160,12 @@
        if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
            return R.error(BaseRes.PARAM);
        }
        if (waitPakin.getBarcode().length() != 8) {
            throw new CoolException("条码长度不是8位===>>" + waitPakin.getBarcode());
        }
        if (Integer.parseInt(waitPakin.getBarcode().substring(0,1)) < 4 || Integer.parseInt(waitPakin.getBarcode().substring(0,1)) > 8 ){
            throw new CoolException("不存在的托盘码类型:"+waitPakin.getBarcode().substring(0,1));
        }
        mobileService.combToWms(waitPakin);
        return R.ok("组托成功");
    }
@@ -171,6 +177,12 @@
        if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
            return R.error(BaseRes.PARAM);
        }
        if (waitPakin.getBarcode().length() != 8) {
            throw new CoolException("条码长度不是8位===>>" + waitPakin.getBarcode());
        }
        if (Integer.parseInt(waitPakin.getBarcode().substring(0,1)) < 4 || Integer.parseInt(waitPakin.getBarcode().substring(0,1)) > 8 ){
            throw new CoolException("不存在的托盘码类型:"+waitPakin.getBarcode().substring(0,1));
        }
        Mat mat = matService.selectById(waitPakin.getModiUser());
        MobileAdjustParam combParam=new MobileAdjustParam();
        ArrayList<CombParam.CombMat> combMats=new ArrayList<>();

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

@@ -735,9 +735,6 @@

    @Override
    public void combToWms(WaitPakin waitPakin) {
        if (waitPakin.getBarcode().length() != 8) {
            throw new CoolException("条码长度不是8位===>>" + waitPakin.getBarcode());
        }
        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", waitPakin.getBarcode()));
        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", waitPakin.getBarcode()));
        WrkMast wrkMast = wrkMastService.selectByBarcode(waitPakin.getBarcode());

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

@@ -573,6 +573,7 @@
            wrkMast.setAppeTime(now);
            wrkMast.setModiUser(userId);
            wrkMast.setModiTime(now);
            wrkMast.setBarcode(locMast.getBarcode());
            boolean res = wrkMastService.insert(wrkMast);
            if (!res) {
                throw new CoolException("保存工作档失败");

 src/main/webapp/views/mat/mat.html

@@ -195,16 +195,16 @@
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">型材型号</label>
                    <label class="layui-form-label layui-form-required">商品名称</label>
                    <div class="layui-input-block">
                        <input name="maktx" placeholder="请输入型材型号" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                        <input name="maktx" placeholder="请输入商品名称" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">模具名称</label>
                    <label class="layui-form-label">商品编码</label>
                    <div class="layui-input-block">
                        <input name="matnr" placeholder="请输入模具名称" class="layui-input">
                        <input name="matnr" placeholder="请输入商品编码" class="layui-input">
                    </div>
                </div>

@@ -246,22 +246,22 @@
<!--                    </div>-->
<!--                </div>-->

<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">模孔数</label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input name="length" placeholder="请输入模孔数" class="layui-input">-->
<!--                    </div>-->
<!--                </div>-->
                <div class="layui-form-item">
                    <label class="layui-form-label">状态</label>
                    <label class="layui-form-label">颜色</label>
                    <div class="layui-input-block">
                        <select id="color" name="color" lay-filter="color" placeholder="请选择状态">
                        <option value="">请选择状态</option>
                        <option value="正常" name="color" class="layui-input">正常</option>
                        <option value="报废" name="color" class="layui-input">报废</option>
                        </select>
                        <input name="color" placeholder="颜色" class="layui-input">
                    </div>
                </div>
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">颜色</label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <select id="color" name="color" lay-filter="color" placeholder="请选择状态">-->
<!--                        <option value="">请选择状态</option>-->
<!--                        <option value="正常" name="color" class="layui-input">正常</option>-->
<!--                        <option value="报废" name="color" class="layui-input">报废</option>-->
<!--                        </select>-->
<!--                    </div>-->
<!--                </div>-->

            </div>
        </div>