#

luxiaotao1123

2023-02-14 414f272bac3f455d23a0da75cc7a308b95d23567

#

 pom.xml

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

    <build>
        <finalName>ynwms</finalName>
        <finalName>szfzwms</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

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

@@ -28,12 +28,10 @@
public class CommonService {

    public static final List<Integer> FIRST_GROUP_ROW_LIST = new ArrayList<Integer>() {{
        add(2);add(3);add(4);add(5);add(6);add(7);add(8);add(9);add(10);
        add(11);add(12);add(13);add(14);add(15);add(16);add(17);
        add(1);add(2);add(3);add(4);
    }};
    public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{
        add(18);add(19);add(20);
        add(21);add(22);add(23);add(24);add(25);add(26);add(27);add(28);add(29);add(30);
        add(5);add(6);add(7);add(8);add(9);add(10);add(11);
    }};

    @Autowired
@@ -110,23 +108,7 @@
     */
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, LocTypeDto oldLocType, int times) {
        StartupDto startupDto = new StartupDto();
        int start = 2;
        int end = 30;
        int dualCrnNo;
        switch (sourceStaNo) {
            case 203:
                whsType = 1;
                dualCrnNo = 2;
                break;
            case 102:
                whsType = 2;
                start = 31;
                end = 32;
                dualCrnNo = 3;
                break;
            default:
                throw new CoolException("数据异常，请联系管理员");
        }
        whsType = 1;
        // 生成工作号
        int workNo = getWorkNo(0);
        RowLastno rowLastno = rowLastnoService.selectById(whsType);
@@ -137,13 +119,7 @@
        int sRow = rowLastno.getsRow();          // 起始列
        int eRow = rowLastno.geteRow();          // 终止列
        int crn_qty = rowLastno.getCrnQty();     // 堆垛机数量（巷道数量）
        int rowCount;
        if (whsType == 1) {
            rowCount = 2;
        } else {
            rowCount = 1;
        }
//        int rowCount = eRow - sRow + 1;          // 库排总数
        int rowCount = eRow - sRow + 1;          // 库排总数
        // 目标堆垛机号
        int crnNo = 0;
        // 目标库位
@@ -151,38 +127,17 @@

        // 靠近摆放规则 --- 同天同规格物料
        if (!Cools.isEmpty(matNos) && matNos.size() == 1) {
            List<String> locNos = locDetlService.getSameDetl(matNos.get(0), start, end);
            List<String> locNos = locDetlService.getSameDetl(matNos.get(0), sRow, eRow);
            for (String locNo : locNos) {
                if (whsType == 1) {
                    LocMast locMast0 = locMastService.findOutMost(locNo);
                    if (null != locMast0) {
                        // 浅库位符合尺寸检测
                        if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                            // 浅库位对应堆垛机必须可用且无异常
                            if (basCrnpService.checkSiteError(dualCrnNo, true)) {
                                crnNo = dualCrnNo;
                                locMast = locMast0;
                                break;
                            }
                        }
                    }
                } else {
                    if (Utils.isShallowLoc(slaveProperties, locNo)) {
                        continue;
                    }
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
                    // 检测目标库位是否为空库位
                    LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                    if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
                        if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
                            // 因库位移转、需预留空库位
                            if (locMastService.checkEmptyCount(shallowLoc)) {
                                if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
                                    locMast = shallowLoc;
                                    crnNo = locMast.getCrnNo();
                                    break;
                                }
                            }
                LocMast locMast0 = locMastService.findOutMost(locNo);
                if (null != locMast0) {
                    // 浅库位符合尺寸检测
                    if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                        // 浅库位对应堆垛机必须可用且无异常
                        if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                            crnNo = locMast0.getCrnNo();
                            locMast = locMast0;
                            break;
                        }
                    }
                }
@@ -192,39 +147,18 @@
        // 靠近摆放规则 --- 空托
        if (staDescId == 10) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("loc_sts", "D").ge("row1", start).le("row1", end));
                    .eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
            if (locMasts.size() > 0) {
                for (LocMast loc : locMasts) {
                    if (whsType == 1) {
                        LocMast locMast0 = locMastService.findOutMost(loc.getLocNo());
                        if (null != locMast0) {
                            // 浅库位符合尺寸检测
                            if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                                // 浅库位对应堆垛机必须可用且无异常
                                if (basCrnpService.checkSiteError(dualCrnNo, true)) {
                                    crnNo = dualCrnNo;
                                    locMast = locMast0;
                                    break;
                                }
                            }
                        }
                    } else {
                        if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
                            continue;
                        }
                        String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
                        // 检测目标库位是否为空库位
                        LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                        if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
                            if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
                                // 因库位移转、需预留空库位
                                if (locMastService.checkEmptyCount(shallowLoc)) {
                                    if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
                                        locMast = shallowLoc;
                                        crnNo = locMast.getCrnNo();
                                        break;
                                    }
                                }
                    LocMast locMast0 = locMastService.findOutMost(loc.getLocNo());
                    if (null != locMast0) {
                        // 浅库位符合尺寸检测
                        if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                            // 浅库位对应堆垛机必须可用且无异常
                            if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                                crnNo = locMast0.getCrnNo();
                                locMast = locMast0;
                                break;
                            }
                        }
                    }

 src/main/java/com/zy/common/service/erp/task/ErpScheduler.java

@@ -16,7 +16,6 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;
@@ -29,7 +28,7 @@
 * Created by vincent on 2020/11/27
 */
@Slf4j
@Component
//@Component
public class ErpScheduler extends AbstractHandler<Exception> {

    @Autowired

 src/main/resources/application.yml

@@ -11,7 +11,7 @@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#    url: jdbc:sqlserver://47.97.1.152:51433;databasename=ynasrs
    url: jdbc:sqlserver://localhost:1433;databasename=ynasrs
    url: jdbc:sqlserver://192.168.4.15:1433;databasename=szfzasrs
    username: sa
#    password: Zoneyung@zy56$
    password: sa@123

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

@@ -1,4 +1,4 @@
var baseUrl = "/ynwms";
var baseUrl = "/szfzwms";

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