no message

skyouc

21 小时以前 a6750821eef3ce19069e5130df59ffe0ef3318ab

no message

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

@@ -6,12 +6,15 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.LocAroundBind;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.InitDeviceLocParams;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.LocAroundBindService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.service.impl.LocMastServiceImpl;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +26,8 @@

    @Autowired
    private LocAroundBindService locAroundBindService;
    @Autowired
    private LocMastServiceImpl locMastService;

    @RequestMapping(value = "/locAroundBind/{id}/auth")
    @ManagerAuth
@@ -64,6 +69,22 @@
    @RequestMapping(value = "/locAroundBind/add/auth")
    @ManagerAuth
    public R add(LocAroundBind locAroundBind) {
        if (Objects.isNull(locAroundBind)) {
            return R.error("参数不能为空！！");
        }
        LocAroundBind aroundBind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", locAroundBind.getBLocNo()));
        if (!Objects.isNull(aroundBind)) {
            return R.error("工位已绑定，不能重复绑定！");
        }

        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locAroundBind.getBLocNo()));
        locMast.setLocSts(LocStsType.LOC_STS_TYPE_X.type);
        locMast.setDeleted(1);
        locMast.setFrozen(1);

        if (!locMastService.updateById(locMast)) {
            return R.error("原库禁用失败！！");
        }
        locAroundBindService.insert(locAroundBind);
        return R.ok();
    }

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

@@ -78,6 +78,8 @@
                  @RequestParam Map<String, Object> param) {
        excludeTrash(param);
        EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
        wrapper.eq("frozen", 0)
                .eq("deleted", 0);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));

 src/main/java/com/zy/asrs/entity/LocAroundBind.java

@@ -57,6 +57,10 @@
    @TableField("loc_type")
    private String locType;

    @ApiModelProperty("机台名称")
    @TableField("dev_name")
    private String devName;

    public LocAroundBind() {}

    public LocAroundBind(Long devId,String devNo,Long bLocId,String bLocNo) {

 src/main/java/com/zy/asrs/entity/LocMast.java

@@ -190,6 +190,9 @@
    @TableField("area_name")
    private String areaName;

    @ApiModelProperty("逻辑删除 默认 0， 删除：1")
    private Integer deleted;

    /**
     * 是否冻结
     */

 src/main/java/com/zy/asrs/entity/WrkDetl.java

@@ -41,6 +41,10 @@
    @ApiModelProperty(value= "数量")
    private Double anfme;

    @ApiModelProperty("实际数量")
    @TableField("real_qty")
    private Double realQty;

    /**
     * 托盘条码
     */

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

@@ -64,7 +64,6 @@
        // 校验库位是否已绑定
        for (LocMast mast : locMasts) {
            LocAroundBind aroundBind = this.selectOne(new EntityWrapper<LocAroundBind>()
                    .eq("dev_no", params.getDevNo())
                    .eq("b_loc_no", mast.getLocNo()));
            if (!Objects.isNull(aroundBind)) {
                continue;
@@ -76,6 +75,16 @@
            if (!this.insert(bind)) {
                throw new CoolException("绑定库位失败");
            }

            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", bind.getBLocNo()));
            locMast.setLocSts(LocStsType.LOC_STS_TYPE_X.type);
            locMast.setDeleted(1);
            locMast.setFrozen(1);

            if (!locMastService.updateById(locMast)) {
                return R.error("原库禁用失败！！");
            }

        }
        return R.ok("绑定库位成功");
    }

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

@@ -421,7 +421,7 @@
        String wrkCode = null;
        if (!Objects.isNull(deviceNo)) {
            wrkCode = workNo + "-1";
//            ioType = 101;
            ioType = 101;
            generateOutStock(taskDto, userId, workNo, wrkCode, now, ioType, locMast, staDesc, deviceNo);
        } else {
            generateOutStock(taskDto, userId, workNo, wrkCode, now, ioType, locMast, staDesc, null);
@@ -483,6 +483,13 @@
            if (Objects.isNull(locMasts)) {
                throw new CoolException("暂无可用工作位！！");
            }

            LocAroundBind bLocNo = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", locMasts.getLocNo()));
            bLocNo.setLocType(LocStsType.LOC_STS_TYPE_R.type);

            if (!locAroundBindService.updateById(bLocNo)) {
                throw new CoolException("工位预约失败！！");
            }
        }

        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locMasts.getLocNo(), 1);

 src/main/resources/application-dev.yml

@@ -31,7 +31,7 @@
  #  global-config:
  #    field-strategy: 0
  configuration:
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    map-underscore-to-camel-case: true
    cache-enabled: true
    call-setters-on-nulls: true

 src/main/webapp/static/js/common.js

@@ -276,6 +276,16 @@
            return num.toFixed(2);
        }
    }
    , {
        field: 'realQty', align: 'center', title: '实际数量', hide: false, templet: function (d) {
            var raw = d.realQty;
            if (raw === null || raw === undefined) return '';
            if (typeof raw === 'string' && raw.trim() === '') return '';
            var num = Number(raw);
            if (!isFinite(num)) return '';
            return num.toFixed(2);
        }
    }
    , {field: 'zpallet', align: 'center', title: 'SN', hide: false}
    , {field: 'specs', align: 'center', title: '规格', hide: false}
    , {

 src/main/webapp/views/locAroundBind/locAroundBind.html

@@ -80,7 +80,7 @@
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">库位码: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="blocNo" placeholder="请输入库位码" lay-vertype="tips" lay-verify="required">
                        <input class="layui-input" name="bLocNo" placeholder="请输入库位码" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">