Merge remote-tracking branch 'origin/bfasrs' into bfasrs

Junjie

2023-05-24 4c98ecfe56a77a17352d01163b9b86fa98f0f2a9

Merge remote-tracking branch 'origin/bfasrs' into bfasrs

# Conflicts:
#	src/main/resources/application.yml

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

@@ -222,8 +222,10 @@

    @RequestMapping(value = "/mat/covert/{id}/auth")
    @ManagerAuth
    public R covert(@PathVariable("id") String id) {
        Mat mat = matService.selectByMatnr(String.valueOf(id));
    public R covert(@PathVariable("id") String id) throws UnsupportedEncodingException{
        byte[] decode = Base64.getDecoder().decode(id);
        String id2 = new String(decode, "utf-8");
        Mat mat = matService.selectByMatnr(id2);
        if (mat == null) {
            return R.ok();
        }

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

@@ -112,6 +112,7 @@
            // 生成入库通知档
            List<DetlDto> detlDtos = new ArrayList<>();
            param.getCombMats().forEach(elem -> {
                elem.setBatch("");
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo(), elem.getCstmr());

                if (Cools.isEmpty(detlDto.getBatch())){
@@ -136,7 +137,7 @@
                }
                WaitPakin waitPakin = new WaitPakin();
                waitPakin.sync(mat);
                waitPakin.setBatch(detlDto.getBatch());
                waitPakin.setBatch("");
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setIoStatus("N");     // 入出状态
                waitPakin.setAnfme(detlDto.getAnfme());  // 数量
@@ -161,7 +162,7 @@
            // 生成入库通知档
            List<DetlDto> detlDtos = new ArrayList<>();
            param.getCombMats().forEach(elem -> {

                elem.setBatch("");
                // 订单明细数量校验
                OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
                if (elem.getAnfme() > orderDetl.getEnableQty()) {
@@ -189,7 +190,7 @@
                WaitPakin waitPakin = new WaitPakin();
                waitPakin.sync(mat);
                waitPakin.setOrderNo(order.getOrderNo());   // 单据编号
                waitPakin.setBatch(detlDto.getBatch());     // 序列码
                waitPakin.setBatch("");     // 序列码
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setIoStatus("N");     // 入出状态
                waitPakin.setAnfme(detlDto.getAnfme());  // 数量

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

@@ -86,7 +86,7 @@
                    }
                    // 遍历工作明细，更新库存明细和入库通知档
                    for (WrkDetl wrkDetl : wrkDetls) {

                        wrkDetl.setBatch("");
                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        if (null != locDetl) {
                            if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {

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

@@ -150,6 +150,7 @@
        }
        // 生成工作档明细
        waitPakins.forEach(waitPakin -> {
            waitPakin.setBatch("");
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(waitPakin);
            wrkDetl.setWrkNo(wrkMast.getWrkNo());

 src/main/resources/application.yml

@@ -10,8 +10,8 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
#    url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
    url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
    username: sa
#    password: Zoneyung@zy56$
    password: sa@123

 src/main/webapp/static/js/order/order.js

@@ -335,7 +335,7 @@
                                    let item = selectList[i];
                                    // 查询物料详情
                                    $.ajax({
                                        url: baseUrl+"/mat/covert/"+item.value+"/auth",
                                        url: baseUrl+"/mat/covert/"+btoa(item.value)+"/auth",
                                        headers: {'token': localStorage.getItem('token')},
                                        method: 'GET',
                                        async: false,