#

mrzhssss

2022-09-21 8d15ae10e5c282d8195d5851b2ae27d06544f4a9

#

 pom.xml

@@ -106,7 +106,7 @@
    </dependencies>

    <build>
        <finalName>lywms</finalName>
        <finalName>stwms</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

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

@@ -120,4 +120,10 @@
        return R.ok();
    }

    @RequestMapping("/locCheck/create/auth")
    public R autoCreate(String prec){
        locCheckService.autoCreatePick(prec);
        return R.ok("创建拣货单成功");
    }

}

 src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.RowLastno;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository;

@Mapper
@@ -11,4 +13,9 @@

    RowLastno findBySection(Integer row);

    @Update("update asr_row_lastno set wrk_mk = 1 where whs_type = 1")
    void updateInitWrkMk();

    @Update("update asr_row_lastno set wrk_mk = 1 where whs_type = #{whs}")
    void updateNextWrkMk(@Param("whs") int i);
}

 src/main/java/com/zy/asrs/service/LocCheckService.java

@@ -5,4 +5,5 @@

public interface LocCheckService extends IService<LocCheck> {

    void autoCreatePick(String prec);
}

 src/main/java/com/zy/asrs/service/RowLastnoService.java

@@ -7,4 +7,6 @@

    RowLastno findBySection(Integer row);

    Integer selectNextWhsType();

}

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

@@ -1,12 +1,24 @@
package com.zy.asrs.service.impl;

import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.mapper.LocCheckMapper;
import com.zy.asrs.entity.LocCheck;
import com.zy.asrs.service.LocCheckService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.service.ManLocDetlService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

@Service("locCheckService")
public class LocCheckServiceImpl extends ServiceImpl<LocCheckMapper, LocCheck> implements LocCheckService {
    @Autowired
    private ManLocDetlService manLocDetlService;

    @Override
    public void autoCreatePick(String prec) {
        List<ManLocDetl> manLocDetls = manLocDetlService.selectList(null);

    }
}

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

@@ -1,6 +1,8 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.RowLastno;
import com.zy.asrs.mapper.RowLastnoMapper;
import com.zy.asrs.service.RowLastnoService;
@@ -13,4 +15,28 @@
    public RowLastno findBySection(Integer row) {
        return this.baseMapper.findBySection(row);
    }

    @Override
    public Integer selectNextWhsType() {
        RowLastno wrk_mk = this.selectOne(new EntityWrapper<RowLastno>()
                .eq("wrk_mk", 1));
        if (Cools.isEmpty(wrk_mk)) {
            this.baseMapper.updateInitWrkMk();
            return 1;
        }else {
            int i = this.selectCount(null);
            if (wrk_mk.getWhsType() >= i){
                this.baseMapper.updateInitWrkMk();
                wrk_mk.setWrkMk("0");
                this.update(wrk_mk,new EntityWrapper<RowLastno>()
                        .eq("whs_type",wrk_mk.getWhsType()));
            }else {
                this.baseMapper.updateNextWrkMk(wrk_mk.getWhsType()+1);
                wrk_mk.setWrkMk("0");
                this.update(wrk_mk,new EntityWrapper<RowLastno>()
                        .eq("whs_type",wrk_mk.getWhsType()));
            }
            return wrk_mk.getWhsType();
        }
    }
}

 src/main/java/com/zy/common/service/CommonService.java

@@ -50,7 +50,7 @@

    /**
     * 生成工作号
     * @param wrkMk 0:入库 1 - 3000 ; 1:拣料/并板/盘点 3001 - 6000 ; 2: 出库 6001 -9000 ; 3:其他 9001 -9999
     * @param wrkMk
     * @return workNo(工作号)
     */
    public int getWorkNo(Integer wrkMk) {
@@ -100,15 +100,7 @@
//        whsType = getWhsType(sourceStaNo, times);
        StartupDto startupDto = new StartupDto();

        if (sourceStaNo < 200){
            whsType = 1;
        } else if (sourceStaNo > 199 && sourceStaNo < 300){
            whsType = 2;
        } else if (sourceStaNo > 299 && sourceStaNo < 400){
            whsType = 3;
        } else if (sourceStaNo > 399){
            whsType = 4;
        }


        RowLastno rowLastno = rowLastnoService.selectById(whsType);
        if (Cools.isEmpty(rowLastno)) {

 src/main/java/com/zy/common/web/WcsController.java

@@ -43,6 +43,8 @@
    private WaitPakinService waitPakinService;
    @Autowired
    private  LocDetlService locDetlService;
    @Autowired
    private RowLastnoService rowLastnoService;

    @PostMapping("/pakin/loc/v1")
    @ResponseBody
@@ -98,6 +100,39 @@
        return R.ok().add(dto);
    }

    @PostMapping("/auto/emptyIn/v1")
    @ResponseBody
    public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto){
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);

        // 检索库位
        StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 15, null, locTypeDto,0);
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(dto.getWorkNo());
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(1L);
        wrkMast.setIoPri(13D);
        wrkMast.setIoType(10);
        wrkMast.setCrnNo(dto.getCrnNo());
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setFullPlt("N"); // 满板：N
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("Y"); // 空板
        wrkMast.setLinkMis("Y");
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        wrkMast.setMemo("自动空托入库");
        return wrkMastService.insert(wrkMast) ? R.ok("自动空托入库成功,工作号:"+wrkMast.getWrkNo()) : R.error("生成自动空托入库失败");
    }

    /**
     * 全板入库
     */

 src/main/java/locCheck.sql

File was deleted

 src/main/java/saasLog.sql

File was deleted

 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8081
  port: 8080
  servlet:
    context-path: /@pom.build.finalName@

@@ -10,7 +10,7 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://192.168.4.15:1433;databasename=hylyasrs
    url: jdbc:sqlserver://192.168.4.15:1433;databasename=stasrs
    username: sa
    password: sa@123
  mvc:

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

@@ -1,4 +1,4 @@
var baseUrl = "/lywms";
var baseUrl = "/stwms";

// 详情窗口-高度
var detailHeight = '80%';

 src/main/webapp/static/js/locCheck/locCheck.js

@@ -220,7 +220,16 @@
            success: function (layero, dIndex) {
                form.render('select');
                form.on('submit(pakin)', function (data) {
                    data.field.selectPerc
                    var prec = $("#selectPerc option:selected").val();
                    $.ajax({
                        url: baseUrl + "/locCheck/create/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: {'prec': prec},
                        method: 'POST',
                        success: function (res) {
                            console.log(res);
                        }
                    })
                })
            }
        });
@@ -249,6 +258,7 @@

        }, 300);
    }

    layDateRender();

});