From fb4cfaec4b05618ef49f483cd80b770a286bb9f8 Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期四, 31 十月 2024 10:13:13 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/controller/OpenController.java | 470 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 235 insertions(+), 235 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index cae3801..5789409 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -1,13 +1,17 @@ package com.zy.asrs.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.core.annotations.AppAuth; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.R; import com.core.exception.CoolException; -import com.zy.asrs.entity.param.*; +import com.zy.asrs.entity.DocType; +import com.zy.asrs.entity.param.CheckParam; +import com.zy.asrs.entity.param.MatSyncParam; +import com.zy.asrs.entity.param.OrderProdSyncParam; +import com.zy.asrs.entity.param.OrderSyncParam; +import com.zy.asrs.service.DocTypeService; import com.zy.asrs.service.OpenService; import com.zy.common.web.BaseController; import lombok.extern.slf4j.Slf4j; @@ -32,115 +36,18 @@ add("ea1f0459efc02a79f046f982767939ae"); }}; + @Autowired private OpenService openService; - - - /****************************************************************************/ - /********************************* 鎵撳寘涓婄嚎 **********************************/ - /****************************************************************************/ - - - @PostMapping("/order/pakin/new/package/v1") - @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛") - public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey, - @RequestBody(required = false) PackParam param, - HttpServletRequest request) { - auth(appkey, param, request); - if (Cools.isEmpty(param)) { - return R.parse(BaseRes.PARAM); - } - openService.packageUp(param); - return R.ok(); - } - - - - /** - * 娣诲姞鍏ュ簱鍗� - */ - @PostMapping("/order/pakin/new/default/v1") - public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey, - @RequestBody OpenOrderPakinParam param, - HttpServletRequest request) { - auth(appkey, param, request); - if (Cools.isEmpty(param)) { - return R.parse(BaseRes.PARAM); - } - if (Cools.isEmpty(param.getOrderNo())) { - return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖"); - } - if (Cools.isEmpty(param.getOrderType())) { - return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖"); - } - if (Cools.isEmpty(param.getOrderDetails())) { - return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖"); - } - openService.pakinOrderCreate(param); - return R.ok(); - } - - /** - * 鍏ュ簱鍗曞洖鍐� - */ - @PostMapping("/order/pakin/complete/default/v1") - public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey, - @RequestBody(required = false) OpenOrderCompleteParam param, - HttpServletRequest request) { - auth(appkey, param, request); - return R.ok().add(openService.pakinOrderComplete(param)); - } - - /** - * 娣诲姞鍑哄簱鍗� - */ - @PostMapping("/order/pakout/new/default/v1") - @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱") - public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey, - @RequestBody OpenOrderPakoutParam param, - HttpServletRequest request) { - 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]涓嶈兘涓虹┖"); - } - if (Cools.isEmpty(param.getOrderType())) { - return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖"); - } - if (Cools.isEmpty(param.getOrderDetails())) { - return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖"); - } - openService.pakoutOrderCreate(param); - return R.ok(); - } - - /** - * 鍑哄簱鍗曞洖鍐� - */ - @PostMapping("/order/pakout/complete/default/v1") - public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey, - @RequestBody(required = false) OpenOrderCompleteParam param, - HttpServletRequest request) { - auth(appkey, param, request); - return R.ok().add(openService.pakoutOrderComplete(param)); - } - + @Autowired + private DocTypeService docTypeService; /** * 搴撳瓨缁熻 */ @RequestMapping("/stock/default/v1") - public R queryStock(@RequestHeader(required = false) String appkey, - HttpServletRequest request) { + public R queryStock(@RequestHeader(required = false) String appkey, HttpServletRequest request) { auth(appkey, null, request); return R.ok().add(openService.queryStock()); } @@ -149,75 +56,16 @@ * 鍟嗗搧淇℃伅鍚屾鎺ュ彛 */ @PostMapping("/mat/v1") - public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey, - @RequestBody(required = false) MatSyncParam param, - HttpServletRequest request){ + @AppAuth(memo = "鐗╂枡鍚屾鎺ュ彛") + public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey, @RequestBody(required = false) MatSyncParam param, HttpServletRequest request) { auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); } - MatSyncParam matSyncParam = openService.syncMat(param); - if (Cools.isEmpty(matSyncParam.getMats()) || matSyncParam.getMats().size() <=0 ) { - return R.error("鏁版嵁寮傚父"); - } - StringBuilder Msg= new StringBuilder("鍘熷洜锛�"); - int MsgT=0,MsgF=0; - for (MatSyncParam.Mats matParam:matSyncParam.getMats()){ - if (matParam.isType()){ - MsgT++; - }else { - MsgF++; - Msg.append(matParam.getMatnr()).append(":").append(matParam.getMemo()).append(";"); - } - } - if (MsgF==0){ - return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�"); - }else if (MsgT==0){ - return R.ok("鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg); - }else { - return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�;"+"鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg); - } + openService.syncMat(param); - } + return R.ok("鏇存柊鎴愬姛"); - /** - * 鍏ュ簱閫氱煡妗g敓鎴� - */ - @PostMapping("/comb/v1") - public synchronized R combMES(@RequestHeader(required = false) String appkey, - @RequestBody(required = false) CombParam param, - HttpServletRequest request){ - auth(appkey, param, request); - if (Cools.isEmpty(param)) { - return R.parse(BaseRes.PARAM); - } - openService.combMes(param); - return R.ok("缁勬墭鎴愬姛"); - } - - /** - * 鍏ュ簱璁板綍鑾峰彇 - */ - @PostMapping("/inlog/v1") - public synchronized R inlogERP(@RequestHeader(required = false) String appkey, - HttpServletRequest request){ - auth(appkey,null, request); - if (Cools.isEmpty()) { - return R.parse(BaseRes.PARAM); - } - return R.ok().add(openService.inlogERP()); - } - /** - * 鍑哄簱璁板綍鑾峰彇 - */ - @PostMapping("/outlog/v1") - public synchronized R outlogERP(@RequestHeader(required = false) String appkey, - HttpServletRequest request){ - auth(appkey,null, request); - if (Cools.isEmpty()) { - return R.parse(BaseRes.PARAM); - } - return R.ok().add(openService.outlogERP()); } @@ -235,105 +83,141 @@ } } - @PostMapping("/order/matSync/default/v1") - public synchronized R syncMatInfoU8(@RequestHeader(required = false) String appkey, - @RequestBody(required = false) Map<String, Object> param, - HttpServletRequest request){ + + @PostMapping("/order/pak/default/v1") + @AppAuth(memo = "鐢熸垚閫�璐цˉ璐у崟鎹�") + public synchronized R orderAccept(@RequestHeader(required = false) String appkey, @RequestBody(required = true) OrderSyncParam param, HttpServletRequest request) { + log.info("鐢熸垚閫�璐цˉ璐у崟鎹�,{}", JSON.toJSONString(param)); auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); } - - int msgU = 0; - int msgT = 0; - int msgF = 0; - StringBuilder msg= new StringBuilder("鍘熷洜锛�"); - - List<MatInfoParam> matDetails = (List<MatInfoParam>) param.get("matDetails"); - - for (Object matDetail : matDetails){ - MatInfoParam matInfoParam = JSONObject.parseObject(JSON.toJSONString(matDetail),MatInfoParam.class); - if (Cools.isEmpty(matDetails)) { - msgF++; - continue; + DocType type = getType(param.get鎿嶄綔鍗曟嵁(), param.getChildren().get(0).getIQuantity()); + if (!Cools.isEmpty(type)) { + if (type.getPakin() == 1) { + openService.syncOrder(param, true, type.getDocName()); + } else { + openService.syncOrder(param, false, type.getDocName()); } - openService.syncMat(matInfoParam); - if(matInfoParam.isUpdate()){ - msgU++; - }else if(matInfoParam.isInsert()){ - msgT++; - } else if(matInfoParam.isError()){ - msgF++; - msg.append(matInfoParam.getCinvcode()).append(":").append(matInfoParam.getMemo()).append(";"); - } + } else { + return R.ok("鍗曟嵁鎺ュ彈澶辫触锛屼笉鏄害瀹氱殑鍗曟嵁l绫诲瀷"); } - String message = ""; - boolean success = false; - if(msgT != 0){ - message += "鎴愬姛鎺ユ敹鐗╂枡锛�"+msgT+"涓�"; - success = true; - } - if(msgU != 0){ - message += "鎴愬姛淇敼鐗╂枡锛�"+msgU+"涓�"; - success = true; - } - if(msgF != 0){ - message += "鎺ユ敹鐗╂枡澶辫触锛�"+msgF+"涓�;"+msg; - } - if(success){ - return R.ok(message); - }else { - return R.error(message); - } +// String docName = param.get鎿嶄綔鍗曟嵁(); +// boolean pakin = param.getPakin() == 1 ? true : false; +// +// openService.syncOrder(param, pakin, docName); -// if (MsgF==0){ -// return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�"); -// }else if (MsgT==0){ -// return R.error("鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg); -// }else { -// return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�;"+"鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg); -// } + return R.ok("鍗曟嵁鎺ュ彈鎴愬姛"); } @PostMapping("/order/pakin/default/v1") @AppAuth(memo = "鐢熸垚鍏ュ簱鍗曟嵁") - public synchronized R orderPakin(@RequestHeader(required = false) String appkey, - @RequestBody(required = false) Map<String, Object> param, - HttpServletRequest request){ + public synchronized R orderPakin(@RequestHeader(required = false) String appkey, @RequestBody(required = true) OrderSyncParam param, HttpServletRequest request) { + log.info("鐢熸垚鍏ュ簱鍗曟嵁,{}", JSON.toJSONString(param)); auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); } - openService.syncOrder(param,true); +// String docName = !Cools.isEmpty(param.getOrderType()) ? param.getOrderType() : param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇閲囪喘鍏ュ簱鍗�" : "閾跺骇閲囪喘閫�璐у崟"; +// boolean pakin = param.getChildren().get(0).getIQuantity() > 0 ? true : false; - return R.ok("鍏ュ簱鍗曟嵁鎺ュ彈鎴愬姛"); + DocType type = getType(param.get鎿嶄綔鍗曟嵁(), param.getChildren().get(0).getIQuantity()); + if (!Cools.isEmpty(type)) { + if (type.getPakin() == 1) { + openService.syncOrder(param, true, type.getDocName()); + } else { + openService.syncOrder(param, false, type.getDocName()); + } + } else { + return R.ok("鍗曟嵁鎺ュ彈澶辫触锛屼笉鏄害瀹氱殑鍗曟嵁l绫诲瀷"); + } + return R.ok("鍗曟嵁鎺ュ彈鎴愬姛"); } - @PostMapping("/order/pakout/default/v1") - @AppAuth(memo = "鐢熸垚鍑哄簱鍗曟嵁") - public synchronized R orderPakout(@RequestHeader(required = false) String appkey, - @RequestBody(required = false) Map<String, Object> param, - HttpServletRequest request){ - + /* + 鐩樼偣鎺ュ彛 + */ + @PostMapping("/check/default/v1") + @AppAuth(memo = "搴撳瓨鐩樼偣") + public synchronized R checkLoc(@RequestHeader(required = false) String appkey, @RequestBody(required = true) CheckParam param, HttpServletRequest request) { auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); } - openService.syncOrder(param,false); + openService.checkAndAdjustLocDetl(param); - return R.ok("鍑哄簱鍗曟嵁鎺ュ彈鎴愬姛"); + return R.ok("搴撳瓨璋冩暣鎴愬姛"); + + } + + + @PostMapping("/order/pakout/default/v1") + //@AppAuth(memo = "鍚屾宸ュ崟鍗曟嵁") + public synchronized R orderPakout(@RequestHeader(required = false) String appkey, + //@RequestBody(required = false) HashMap<String,Object> param, + @RequestBody(required = false) OrderProdSyncParam param, HttpServletRequest request) { + log.info("鍚屾宸ュ崟鍗曟嵁,{}", JSON.toJSONString(param)); + ///auth(appkey, param, request); + if (Cools.isEmpty(param)) { + return R.parse(BaseRes.PARAM); + } + + DocType type = getType(param.get鎿嶄綔鍗曟嵁(), param.getIQuantity()); + if (!Cools.isEmpty(type)) { + if (param.get鎿嶄綔鍗曟嵁().equals("MO")) { + mappingPakInOrderParam(param, true, type.getDocName()); + if (!Cools.isEmpty(param.getChildren())) { + mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"); + } + } else if (param.get鎿嶄綔鍗曟嵁().equals("OM")) { + mappingPakInOrderParam(param, true, type.getDocName()); + if (!Cools.isEmpty(param.getChildren())) { + mappingPakOutOrderParam(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�"); + } + + } else { + if (type.getPakin() == 1) { + mappingPakInOrderParam(param, true, type.getDocName()); + if (!Cools.isEmpty(param.getChildren())) { + mappingPakOutOrderParam(param, false, type.getDocName()); + } + } else { + mappingPakOutOrderParam(param, false, type.getDocName()); + } + } + } else { + return R.ok("鍗曟嵁鎺ュ彈澶辫触锛屼笉鏄害瀹氱殑鍗曟嵁l绫诲瀷"); + } + +// if (!Cools.eq("鐢熶骇", param.getCVouchtype())) { +// String docName = param.getIQuantity() > 0 ? "閾跺骇濮斿鍏ュ簱鍗�" : "閾跺骇濮斿鍏ュ簱閫�璐у崟"; +// boolean pakin = param.getIQuantity() > 0 ? true : false; +// mappingPakInOrderParam(param, pakin, docName); +// +// if (!Cools.isEmpty(param.getChildren())) { +// String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇濮斿鏉愭枡鍑哄簱鍗�" : "閾跺骇濮斿鏉愭枡閫�鏂欏崟"; +// boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false; +// mappingPakOutOrderParam(param, pakin1, docName1); +// } +// +// } else if (!Cools.isEmpty(param.getChildren())) { +// String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�" : "閾跺骇鐢熶骇鏉愭枡閫�鏂欏崟"; +// boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false; +// mappingPakOutOrderParam(param, pakin1, docName1); +// } + + return R.ok("鍗曟嵁鎺ュ彈鎴愬姛"); } @PostMapping("/order/delete/default/v1") @AppAuth(memo = "鍗曟嵁鍒犻櫎瀹℃牳") - public synchronized R orderDelete(@RequestHeader(required = false) String appkey, - @RequestBody(required = false) Map<String, Object> param, - HttpServletRequest request){ + public synchronized R orderDelete(@RequestHeader(required = false) String appkey, @RequestBody(required = false) Map<String, Object> param, HttpServletRequest request) { + log.info("鍗曟嵁鍒犻櫎瀹℃牳,{}", JSON.toJSONString(param)); auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); @@ -341,12 +225,128 @@ boolean success = openService.orderDelete(param.get("id").toString()); - if(success){ + if (success) { return R.ok("鍗曟嵁鍒犻櫎鎴愬姛"); - }else { + } else { return R.error("鍗曟嵁姝e湪鎵ц锛屽垹闄ゅけ璐�"); } } + private void mappingPakInOrderParam(OrderProdSyncParam param, boolean pakin, String docName) { + //鐢熸垚鍗曟嵁涓讳綋 + OrderSyncParam orderSyncParam = new OrderSyncParam(); + orderSyncParam.set鎿嶄綔绯荤粺鍙�(param.get鎿嶄綔绯荤粺鍙�()); + orderSyncParam.setcPOID(param.getOrderNoT()); + orderSyncParam.setDdate(param.getOrderTime()); + orderSyncParam.setcMemo(param.getCMemo()); + + //鐢熸垚鍗曟嵁鏄庣粏 + OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl(); + orderDetl.setcInvCode(param.getCInvCode()); + orderDetl.setiQuantity(param.getIQuantity()); + orderDetl.setcDefine22(param.getDefine24()); + orderDetl.setbFree1(param.getBFree1()); + orderDetl.setId(param.getId()); + orderDetl.setIvouchrowno(param.getIvouchrowno()); + + //娣诲姞鍗曟嵁鏄庣粏鍒板崟鎹富浣� + List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>(); + orderDetls.add(orderDetl); + + orderSyncParam.setChildren(orderDetls); + +// String docName = param.getIQuantity() > 0 ? "閾跺骇浜у搧鐢熶骇鍏ュ簱鍗�" : "鍏ュ簱閫�鍥炲崟"; +// boolean pakin = param.getIQuantity() > 0 ? true : false; + + openService.syncOrder(orderSyncParam, pakin, docName); + + //return orderSyncParam; + } + + private void mappingPakOutOrderParam(OrderProdSyncParam param, boolean pakin, String docName) { + OrderSyncParam orderSyncParam = new OrderSyncParam(); + + List<OrderProdSyncParam.ChildInfo> child = param.getChildren(); + + //鐢熸垚鍗曟嵁涓讳綋 + orderSyncParam.set鎿嶄綔绯荤粺鍙�(param.get鎿嶄綔绯荤粺鍙�()); + orderSyncParam.setcPOID(child.get(0).getOrderNoT()); + orderSyncParam.setDdate(param.getOrderTime()); + orderSyncParam.setcMemo(param.getCMemo()); + + //鐢熸垚鍗曟嵁鏄庣粏 + List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>(); + + for (OrderProdSyncParam.ChildInfo childInfo : child) { + OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl(); + orderDetl.setcInvCode(childInfo.getCInvCode()); + orderDetl.setiQuantity(childInfo.getIQuantity()); + orderDetl.setCsocode(param.getCsocode()); + orderDetl.setbFree1(childInfo.getBFree1()); + orderDetl.setId(childInfo.getIds()); + orderDetl.setIvouchrowno(childInfo.getIvouchrowno()); + + orderDetls.add(orderDetl); + } + orderSyncParam.setChildren(orderDetls); + + openService.syncOrder(orderSyncParam, false, docName); + + //return orderSyncParam; + } + + + private DocType getType(String type, Double iQuantity) { + DocType docType = new DocType(); + switch (type) { + case "Purchase": + docType.setDocName("閾跺骇閲囪喘鍏ュ簱鍗�"); + docType.setPakin(1); + break; + case "MO": + docType.setDocName("閾跺骇鐢熶骇璁㈠崟"); + docType.setPakin(0); + break; + case "OM": + docType.setDocName("閾跺骇濮斿鐢熶骇璁㈠崟"); + docType.setPakin(0); + break; + case "閲囪喘鍏ュ簱鍗曢��璐�": + docType.setDocName("閾跺骇閲囪喘鍏ュ簱鍗曢��璐у崟"); + docType.setPakin(0); + break; + case "濮斿鍏ュ簱鍗曢��璐�": + docType.setDocName("閾跺骇濮斿鍏ュ簱鍗曢��璐у崟"); + docType.setPakin(1); + break; + case "鐢熶骇鏉愭枡鍑哄簱閫�鏂�": + docType.setDocName("閾跺骇鐢熶骇鏉愭枡鍑哄簱閫�鏂欏崟"); + docType.setPakin(1); + break; + case "濮斿鏉愭枡鍑哄簱閫�鏂�": + docType.setDocName("閾跺骇濮斿鏉愭枡鍑哄簱閫�鏂欏崟"); + docType.setPakin(1); + break; + case "鐢熶骇鏉愭枡鍑哄簱琛ユ枡": + docType.setDocName("閾跺骇鐢熶骇鏉愭枡鍑哄簱琛ユ枡鍗�"); + docType.setPakin(0); + break; + case "濮斿鏉愭枡鍑哄簱琛ユ枡": + docType.setDocName("閾跺骇濮斿鏉愭枡鍑哄簱琛ユ枡鍗�"); + docType.setPakin(0); + break; + case "鍏朵粬鍏ュ簱鍗�": + docType.setDocName("閾跺骇鍏朵粬鍏ュ簱鍗�"); + docType.setPakin(1); + break; + case "鍏朵粬鍑哄簱鍗�": + docType.setDocName("閾跺骇鍏朵粬鍑哄簱鍗�"); + docType.setPakin(0); + break; + default: + docType = docTypeService.selectOrAdd(type, iQuantity > 0); + } + return docType; + } } -- Gitblit v1.9.1