#

luxiaotao1123

2022-05-15 411aaaac54137fc09332b4f3f1413df370d6374d

#

 src/main/java/com/zy/common/CodeRes.java

@@ -9,4 +9,6 @@
    String USER_10002 = "10002-账号已被禁用";
    String USER_10003 = "10003-密码错误";

    String PICK_600 = "600-拣料任务";

}

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

@@ -7,6 +7,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
@@ -59,6 +60,10 @@
            }
            waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
            if (Cools.isEmpty(waitPakins)) {
                WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
                if (wrkMast != null && wrkMast.getIoType() == 103) {
                    return R.parse(CodeRes.PICK_600);
                }
                return R.error("条码数据错误");
            }
            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));

 src/main/resources/application.yml

@@ -10,8 +10,8 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://localhost:1433;databasename=jkasrs
#    url: jdbc:sqlserver://10.20.192.201:1433;databasename=jkasrs
#    url: jdbc:sqlserver://localhost:1433;databasename=jkasrs
    url: jdbc:sqlserver://10.20.192.201:1433;databasename=jkasrs
    username: sa
    password: sa@123
  mvc: