#

fyxc

2025-04-10 4ccff12cf03a050f060b40180873ecd459b2333f

#

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

@@ -59,8 +59,8 @@
    /**
     * 商品编号
     */
    @ApiModelProperty(value= "商品编号")
    @ExcelProperty(value = "商品编码")
    @ApiModelProperty(value= "物料编码")
    @ExcelProperty(value = "物料编码")
    private String matnr;


@@ -68,7 +68,7 @@
     * 商品名称
     */
    @ApiModelProperty(value= "商品名称")
    @ExcelProperty(value = "商品名称")
    @ExcelProperty(value = "物料名称")
    private String maktx;

    /**

 src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java

@@ -89,31 +89,27 @@
                if (Cools.isEmpty(locMastStart)) {
                    continue;
                }
                if (!Utils.isShallowLoc(slaveProperties, locMastStart.getLocNo())) {
                if (Utils.isShallowLoc(slaveProperties, locMastStart.getLocNo())) {
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, locMastStart.getLocNo());
                    LocMast locNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLocNo));
                    if (locNo != null && !locNo.getLocSts().equals("O")) {
                    if (locNo != null && locNo.getLocSts().equals("D")) {
                        locMastStart = locNo;
                    }
                }
                LocMast locMastEnd = locMastService.selectOne(new EntityWrapper<LocMast>()
                        .eq("loc_sts", "O")
                        .eq("crn_no", basCrnp.getCrnNo())
                        .eq("loc_type1", locMastStart.getLocType1())
                        //.eq("loc_type1", locMastStart.getLocType1())
                        .ne("modi_user", 77)
                        .orderBy("row1", true));//目标
                        .orderBy("lev1", true));//目标
                if (Cools.isEmpty(locMastEnd)) {
                    continue;
                }
                if (!Utils.isShallowLoc(slaveProperties, locMastEnd.getLocNo())) {
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, locMastEnd.getLocNo());
                if (Utils.isShallowLoc(slaveProperties, locMastEnd.getLocNo())) {
                    String shallowLocNo = Utils.getDeepLoc(slaveProperties, locMastEnd.getLocNo());
                    LocMast locNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLocNo));
                    if (locNo != null && locNo.getLocSts().equals("O")) {

                    } else {
                        locMastEnd.setModiUser(77L);
                        locMastService.updateById(locMastEnd);
                        continue;
                    if (locNo != null && locNo.getModiUser() != 77L && locNo.getLocSts().equals("O")) {
                        locMastEnd = locNo;
                    }
                }
//                if (Cools.isEmpty(locMastStart) || Cools.isEmpty(locMastEnd)){

 src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java

@@ -33,7 +33,7 @@
            LocMast locMastEndNew = null;


            workService.locMove(locMastStart.getLocNo(), locMastEnd.getLocNo(), 66L);
            workService.locMove(locMastStart.getLocNo(), locMastEnd.getLocNo(), 77L);
        } catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();