#调试

lty

2025-05-17 7e4c4560f31b116ed5a274ce0b9c55144999252d

#调试

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -243,7 +243,7 @@
    }

    public static boolean BooleanWhsTypeStaIoType(Integer whsType) {  //查询相似物料开关
        if (whsType == 1 || whsType==3 || whsType==4) {
        if (whsType == 1 ||whsType==2 || whsType==3 || whsType==4) {
            return true;
        }
        return false;

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

@@ -325,10 +325,22 @@

        // 1.按规则查找库位
        if (Cools.isEmpty(locMast) && crnNo != 0) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("row1", nearRow)
                    .eq("loc_sts", "O")
                    .orderBy("lev1",true).orderBy("bay1",true));
            List<LocMast> locMasts = null;
            if(sourceStaNo % 100 > 10){
                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("row1", nearRow)
                        .eq("loc_sts", "O")
                        .orderBy("lev1",true).orderBy("bay1",false));
            }else{
                 locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("row1", nearRow)
                        .eq("loc_sts", "O")
                        .orderBy("lev1",true).orderBy("bay1",true));
            }
//            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
//                    .eq("row1", nearRow)
//                    .eq("loc_sts", "O")
//                    .orderBy("lev1",true).orderBy("bay1",true));
//            for (LocMast locMast1 : locMasts) {
//                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
//                    continue;

 src/main/java/com/zy/third/lk/entity/InDetTB.java

@@ -34,7 +34,7 @@
@NoArgsConstructor
@AllArgsConstructor
@Data
@TableName("LK_InDetTB")
@TableName("lk_InDetTB")
public class InDetTB implements Serializable {

    private static final long serialVersionUID = 1L;

 src/main/java/com/zy/third/lk/entity/OutHedTBBak.java

@@ -15,7 +15,7 @@

import java.io.Serializable;

@TableName("lk_OutHedTb_bak")
@TableName("lk_OutHedTB_bak")
public class OutHedTBBak implements Serializable {

    private static final long serialVersionUID = 1L;

 src/main/resources/application.yml

@@ -109,9 +109,9 @@
  refreshtime: 0/5 * * * * ?
  db:
    driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://192.168.1.147:1800;databasename=XDLinkLK
    username: XGMLK
    password: xunda0413
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=TZGLLK
    username: sa
    password: sa@123
#    url: jdbc:sqlserver://192.168.4.138:1433;databasename=XDLinkLK2
#    username: sa
#    password: sa@123