#

zc

2 天以前 56de968727bd6e871c6823dce837f8d42f30e6f8

#

 license.lic

@@ -1,6 +1,3 @@
¸!´;ɉ‡r-C—>•?Í<ñÒ÷©—zàÃ)̨
]
½æñGµ˯PeUgYóŸ\¡
Óki5ÚU,6»FýDð7^Ò-jÁŠVŠ¬­§ÃÀV)fÚ+«©·°ãÇÓ©WoSäci*4¤‡ÅG2ÿè “øÒÍ3:}ÌÑ渃@÷æ­


ìLvYO-SzŠ§qßaUŽòG²ºUê2FE·Ú#¾lé=Žs•üjŠHè
Ça3sdL®Á`eû§‘HÇ©¯wÿ§îÜN—(sgÝ$ |ށgÙzÝ2°"\/Ø~7^C›a´«™œ¸Ôáµ) ¢
µ*
22RÎ6…™¬É5O˜ÂhÄ¿ƒH­ÜŽf†Ð¡•ŒÐÖ¨¶@~:ï=Çß| ¸Ðš
‚Ú®OP]&É`B;ëf*"5‹Þìõ·¸½À—$fäՍBb‚Na|\‰
³ð=–m–zÚˍtϞ}NZ\JüoÄhƒ¶àRlÀ_º‘!][Ñ3Kq]EÝûÖ=æjiI($¥&ꌜñçR€éQ.‡Ø›ÿÉýŠªŽýõ*<饨¨.¥’NÔ+èdû™.Œ«˱\+5m~Ðw€øx5ú–zl0Êu£[“p
1X@o}l¸«õ:¼ÞmºhiOw”5©‡õ‹
¨ÕxG    rþbWe(»‚‘¤ÊòGb—>匠øªô­~+”`ÖO4(Ýtk˜¥cX3FvêˆIËB«i<ã¿3â1fO"o_O­ñËu,э-²”ú‰ªž•CB2Ç bp2WkÇˆ0æĂ/¿Á%ž|èláõ”VÛD»×ÄŸbr Æª%y':¤[    Þ'NnӞàtç:&7-
¸!´;ɉ‡¢Ç»Ûkõ£g‡¡+½N“NQM¢7¤m\îaPe«~j`YǦ_Ì"K—Ù¥å–ÅìÒÔɑfIäÄÑJ”¶¯è<t×uI²7çúÏl`²dt¨Z¡7猉à_°“»—ݼh‘òÍiTAN³Ay“Ó«™£¨-a¼4Ò:Æ|)
–ƒ#7{e93²±Sô\!®K
ÄËi gr÷M“#K፸Ðù¿&½Ÿ
H²ã¿&êlÔHPpۚÐÑ¡M³çvŽ™,Ü^ûÄs:ö_å;ƒ±þ÷ÂkKšÐ(üº½vÙ ÷3fŒaPFû
£§OûY•ÂÎ)¬›þËæØ3™$v’ŽÑr›‚§›%¼KÃÿ%9Ó­›™ïÎ[»>)=8b@9±ac³ï2ÅÖ$°¤¹‰CäSâd ÷e¿‡%ãíNm·éçásb©ª˜êåö×aðCȌ2I^jKWР   b‘õ
Rü¹ÿˆlOéþßyö'OË·Ü'šUÂø5'&ˆGQ—¯”»ù6ÂæoŠ^Sr;Y°){_¥#xGáX*‘.•!d®=Xî§J¤‡¨    çð?sq—´Âž£«'’Pɪz93ƒøš|0-Úô[êÙëxu0ò¶«Ã–Ç
ޙd7)PB&ó[kŠó]êXGr¤5Õys¸Ý
òåœÄ¡Ïh6Ýúè‰-Q@O­kih–'fzë`"?ƒ#‰É»hû„<ÅF3ÊjÞVo­A£Á@¦Í:À.yLZõ¨,9ªóun—#V0f|D¬þ»sTâ=…“9~
~F³
Ç7¬dÐ| N+6¥”x¬$v˜Ù¨<å®"ÄM^ü;¢Žü’fwœXd)0
âãï´þÍÉ&Lؤ\Èg!¡ºRe¥âÈ$ª êG€‰ƒ%š;¿}ÑnÁkÀµ+ìq}»-9ó`ýò†)!8öÍDÔOQœsõÕûçò†26¢P?ª„
A

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

@@ -27,7 +27,7 @@
 */
@Slf4j
@RestController
@RequestMapping("open/wms")
@RequestMapping("Open/wms")
public class OpenMesController extends BaseController {

    private static final boolean auth = true;
@@ -87,18 +87,18 @@
        return R.ok();
    }

    @PostMapping("/orderSync/default/v1")
    @AppAuth(memo = "订单信息同步接口")
    public synchronized R syncOrderInfo(@RequestHeader(required = false) String appkey,
                                        @RequestBody(required = false) GTOrderParam param,
                                        HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }

        return R.ok();
    }
//    @PostMapping("/orderSync/default/v1")
//    @AppAuth(memo = "订单信息同步接口")
//    public synchronized R syncOrderInfo(@RequestHeader(required = false) String appkey,
//                                        @RequestBody(required = false) GTOrderParam param,
//                                        HttpServletRequest request) {
//        auth(appkey, param, request);
//        if (Cools.isEmpty(param)) {
//            return R.parse(BaseRes.PARAM);
//        }
//
//        return R.ok();
//    }


    /**
@@ -130,7 +130,7 @@
    /**
     * 添加出库单
     */
    @PostMapping("/order/pakout/default/v1")
    @PostMapping("/order/pakout/auth/v1")
    @AppAuth(memo = "添加订单出库")
    public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
                                            @RequestBody OpenOrderPakoutParam param,
@@ -138,12 +138,6 @@
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getLgort())) {
            return R.error("单据编号[lgort]不能为空");
        }
        if (!param.getLgort().equals("5006")) {
            return R.ok();
        }
        if (Cools.isEmpty(param.getOrderNo())) {
            return R.error("单据编号[orderNo]不能为空");
@@ -210,15 +204,15 @@
    private void auth(String appkey, Object obj, HttpServletRequest request) {
        log.info("{}接口被访问；appkey:{}；请求数据：{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
        request.setAttribute("cache", obj);
        if (!auth) {
            return;
        }
        if (Cools.isEmpty(appkey)) {
            throw new CoolException("认证失败，请确认appkey无误！");
        }
        if (!APP_KEY_LIST.contains(appkey)) {
            throw new CoolException("认证失败，请确认appkey无误！");
        }
//        if (!auth) {
//            return;
//        }
//        if (Cools.isEmpty(appkey)) {
//            throw new CoolException("认证失败，请确认appkey无误！");
//        }
//        if (!APP_KEY_LIST.contains(appkey)) {
//            throw new CoolException("认证失败，请确认appkey无误！");
//        }
    }



 src/main/java/com/zy/asrs/entity/param/MatSyncParam.java

@@ -33,7 +33,7 @@
        /**
         * 商品分类
         */
        private String groupCode;
        private String tagId;

        /**
         * 分类名称
@@ -196,4 +196,10 @@
        private String memo;
    }

    public MatSyncParam() {
    }

    public MatSyncParam(List<MatParam> matDetails) {
        this.matDetails = matDetails;
    }
}

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

@@ -478,6 +478,10 @@
            throw new CoolException("商品数据为空");
        }





        for(MatSyncParam.MatParam matParam : param.getMatDetails()){
            if(Cools.isEmpty(matParam.getMatnr())){
                throw new CoolException("商品编码不能为空");
@@ -488,19 +492,81 @@
            // 分类
            Long tagId;
            // 一级分类
            Tag tag = tagService.selectOne(new EntityWrapper<Tag>().eq("memo", matParam.getGroupCode()));
            if (tag == null) {
                throw new CoolException("出错，未找到分类");
            if (!Cools.isEmpty(matParam.getTagId()) && !Cools.isEmpty(matParam.getGroupName())) {
                Tag priTag = tagService.selectByName(matParam.getTagId(), 1);
                if (priTag == null) {
                    Tag top = tagService.getTop();
                    NodeUtils nodeUtils = new NodeUtils();
                    nodeUtils.executePath(top.getId());
                    priTag = new Tag(
                            null,    // 编号
                            matParam.getTagId(),    // 名称
                            top.getId(),    // 父级
                            top.getName(),    // 父级名称
                            nodeUtils.path.toString(),    // 关联路径
                            nodeUtils.pathName.toString(),    // 关联路径名
                            0,    // 类型
                            null,    // 负责人
                            null,    // 图片
                            null,    // 简要描述
                            null,    // 数量
                            2,    // 等级
                            null,    // 排序
                            1,    // 状态
                            now,    // 添加时间
                            null,    // 添加人员
                            now,    // 修改时间
                            null,    // 修改人员
                            null    // 备注
                    );
                    if (tagMapper.insert(priTag) == 0) {
                        throw new CoolException("服务器内部错误，请联系管理员");
                    }
                }
                // 二级分类
                Tag secTag = tagService.selectByName(matParam.getGroupName(), 2);
                if (secTag == null) {
                    NodeUtils nodeUtils = new NodeUtils();
                    nodeUtils.executePath(priTag.getId());
                    secTag = new Tag(
                            null,    // 编号
                            matParam.getGroupName(),    // 名称
                            priTag.getId(),    // 父级
                            priTag.getName(),    // 父级名称
                            nodeUtils.path.toString(),    // 关联路径
                            nodeUtils.pathName.toString(),    // 关联路径名
                            0,    // 类型
                            null,    // 负责人
                            null,    // 图片
                            null,    // 简要描述
                            null,    // 数量
                            2,    // 等级
                            null,    // 排序
                            1,    // 状态
                            now,    // 添加时间
                            null,    // 添加人员
                            now,    // 修改时间
                            null,    // 修改人员
                            null    // 备注
                    );
                    if (tagMapper.insert(secTag) == 0) {
                        throw new CoolException("服务器内部错误，请联系管理员");
                    }
                }
                tagId = secTag.getId();
            } else {
                tagId = tagService.getTop().getId();
            }
            if (mat == null) {
                mat = new Mat();

                mat.sync(matParam);
//            mat.setMatnr(param.getMatnr());
//            mat.setMaktx(param.getMaktx());
//            mat.setSpecs(param.getSpecs());
//            mat.setModel(param.getModel());

                mat.setTagId(tag.getId());
                mat.setTagId(tagId);
                mat.setStatus(1);
                mat.setCreateTime(now);
                mat.setUpdateTime(now);
@@ -511,11 +577,45 @@
                }
            } else {
                mat.sync(matParam);
                mat.setTagId(tag.getId());
                mat.setTagId(tagId);
                if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
                    throw new CoolException("更新已存在商品信息失败，请联系管理员");
                }
            }






            //Tag tag = tagService.selectOne(new EntityWrapper<Tag>().eq("memo", matParam.getTagId()));
//            if (tag == null) {
//                throw new CoolException("出错，未找到分类");
//            }
//            if (mat == null) {
//                mat = new Mat();
//                mat.sync(matParam);
////            mat.setMatnr(param.getMatnr());
////            mat.setMaktx(param.getMaktx());
////            mat.setSpecs(param.getSpecs());
////            mat.setModel(param.getModel());
//
//                mat.setTagId(tag.getId());
//                mat.setStatus(1);
//                mat.setCreateTime(now);
//                mat.setUpdateTime(now);
//                if (!matService.insert(mat)) {
//                    throw new CoolException("服务器内部错误，请联系管理员");
//                } else {
//                    log.info("同步新物料[商品编号：{}]", mat.getMatnr());
//                }
//            } else {
//                mat.sync(matParam);
//                mat.setTagId(tag.getId());
//                if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
//                    throw new CoolException("更新已存在商品信息失败，请联系管理员");
//                }
//            }
        }

    }

 src/main/resources/license.lic

Binary files differ