#

18516761980

2023-03-01 400b37f6238bd6ecd2fc108366e84c4363d61ddb

#

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

@@ -76,9 +76,9 @@
    }

    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")
//    @ManagerAuth(memo = "组托")
    public R comb(@RequestBody CombParam combParam){
        mobileService.comb(combParam, getUserId());
        mobileService.comb(combParam, 1l);
        return R.ok("组托成功");
    }


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

@@ -1,5 +1,6 @@
package com.zy.common.web;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
@@ -58,35 +59,37 @@
        if (Cools.isEmpty(param.getSourceStaNo())) {
            return R.error("源站编号不能为空");
        }
//        List<WaitPakin> waitPakins = null;
        List<WaitPakin> waitPakins = null;
        Mat mat = null;
        if (param.getIoType() == 1) {
            if (Cools.isEmpty(param.getBarcode())) {
                return R.error("条码不能为空");
            }
            Goods goods = erpService.selectGoodsOne(param.getBarcode());
            if (Cools.isEmpty(goods)) {
                return R.error(param.getBarcode() + "条码不存在，请检查ERP数据！");
            } else {
                erpService.updateStateForGoods(param.getBarcode(), 2);
            }
            mat = matService.selectByMatnr(goods.getMaterialNO());
            if (Cools.isEmpty(mat)) {
                return R.error(goods.getMaterialNO() + "条码商品资料不存在，请先添加！");
            }
//            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 || wrkMast.getIoType() == 104 || wrkMast.getIoType() == 107)) {
//                    return R.parse(CodeRes.PICK_600);
//                }
//                return R.parse(CodeRes.NO_COMB_700);
//            Goods goods = erpService.selectGoodsOne(param.getBarcode());
//            if (Cools.isEmpty(goods)) {
//                return R.error(param.getBarcode() + "条码不存在，请检查ERP数据！");
//            } else {
//                erpService.updateStateForGoods(param.getBarcode(), 2);
//            }
//            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
//            int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
//            if (countLoc > 0 || countWrk > 0) {
//                return R.error("工作档/库存条码数据已存在");
//            mat = matService.selectByMatnr(goods.getMaterialNO());
//            if (Cools.isEmpty(mat)) {
//                return R.error(goods.getMaterialNO() + "条码商品资料不存在，请先添加！");
//            }
            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 || wrkMast.getIoType() == 104 || wrkMast.getIoType() == 107)) {
                    return R.parse(CodeRes.PICK_600);
                }
                return R.parse(CodeRes.NO_COMB_700);
            }
            mat = matService.selectByMatnr(waitPakins.get(0).getMatnr());
            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
            int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
            if (countLoc > 0 || countWrk > 0) {
                return R.error("工作档/库存条码数据已存在");
            }
        }
//        if (Cools.isEmpty(param.getLocType1())){
//            return R.error("高低检测信号不能为空");

 src/main/resources/application.yml

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