From 0ff927605ae5df1cb63fbe6cb838c35da43be8ac Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 11 十一月 2024 10:58:14 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/controller/OpenController.java | 608 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 357 insertions(+), 251 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 555d31b..4f7716f 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,293 +1,399 @@
package com.zy.asrs.controller;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.annotations.ManagerAuth;
+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.BasDevp;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.entity.param.OpenApiStockOutParam;
-import com.zy.asrs.entity.result.PakoutVo;
-import com.zy.asrs.entity.result.StoPreTab;
-import com.zy.asrs.service.*;
-import com.zy.common.model.LocDetlDto;
+import com.zy.asrs.entity.param.*;
+import com.zy.asrs.service.OpenService;
+import com.zy.common.utils.Synchro;
+import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
/**
- * Created by vincent on 2021/3/19
+ * Created by vincent on 2022/4/8
*/
+@Slf4j
@RestController
-@RequestMapping("/open/api")
-public class OpenController {
+@RequestMapping("open/asrs")
+public class OpenController extends BaseController {
+
+ private static final boolean auth = true;
+ public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
+ add("ea1f0459efc02a79f046f982767939ae");
+ }};
+
@Autowired
- private LocDetlService locDetlService;
- @Autowired
- private MatCodeService matCodeService;
- @Autowired
- private WorkService workService;
- @Autowired
- private BasDevpService basDevpService;
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private JdbcTemplate jdbcTemplate;
+ private OpenService openService;
- @PostMapping("/stockOut/prew")
- @Transactional
- public R stockOutPrew(@RequestBody List<OpenApiStockOutParam> params){
- List<StoPreTab> result = new ArrayList<>();
- StringBuilder errorMsg = new StringBuilder();
- boolean error = false;
- for (OpenApiStockOutParam param : params) {
- Double sumAnfme = Optional.ofNullable(locDetlService.getSumAnfme(param.getMatnr())).orElse(0.0D);
- double lack = 0.0D;
- if (sumAnfme < param.getAnfme()) {
- lack = param.getAnfme() - sumAnfme;
- if (!error) {
- error = true;
- }
- MatCode mat = matCodeService.selectById(param.getMatnr());
- // 瑙嗗浘瀵硅薄
- StoPreTab tab = new StoPreTab();
- tab.setTitle(param.getMatnr() + (mat==null?"": "锛�" + mat.getMatName() + "锛�"));
- tab.setMatnr(param.getMatnr());
- tab.setMaktx((mat==null?"": "锛�" + mat.getMatName() + "锛�"));
- tab.setAnfme(param.getTotal());
- tab.setLocNo("缂鸿揣");
- tab.setTotal(lack);
- tab.setReduce(lack);
- tab.setRemQty(0.0D);
- tab.setPrior(false);
- tab.setPrior$("脳");
- tab.setType(0);
- result.add(tab);
+ /**
+ * 搴撳瓨缁熻
+ */
+ @RequestMapping("/stock/default/v1")
+ public R queryStock(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ return R.ok().add(openService.queryStock());
+ }
- errorMsg.append(mat == null ? param.getMatnr() : mat.getMatName()).append("搴撳瓨涓嶈冻锛岀己璐ф暟閲忥細").append(param.getAnfme() - sumAnfme).append("</br>");
-// continue;
- }
- List<LocDetl> locDetls = locDetlService.selectPakoutByRule(param.getMatnr());
- double issued = Optional.of(param.getAnfme() - lack).orElse(0.0D) ;
- for (LocDetl locDetl : locDetls) {
- if (issued > 0) {
- // 瑙嗗浘瀵硅薄
- StoPreTab tab = new StoPreTab();
- tab.setTitle(locDetl.getMatnr() + "锛�" + locDetl.getMaktx() + "锛�");
- tab.setMatnr(locDetl.getMatnr());
- tab.setMaktx(locDetl.getMaktx());
- tab.setAnfme(param.getTotal());
-
- tab.setLocNo(locDetl.getLocNo());
-// tab.setNodeId(locDetl.getNodeId());
- tab.setTotal(locDetl.getAnfme());
- tab.setReduce(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
- tab.setRemQty(tab.getTotal() - tab.getReduce());
- tab.setPrior(false);
- tab.setPrior$("脳");
- tab.setType(2);
- result.add(tab);
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- }
- }
-
+ /**
+ * 鍟嗗搧淇℃伅鍚屾鎺ュ彛
+ */
+ @PostMapping("/mat/v1")
+ @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);
}
-// if (error) {
-// return R.error(errorMsg.toString());
+ openService.syncMat(param);
+
+ return R.ok("鏇存柊鎴愬姛");
+
+ }
+
+
+ private void auth(String appkey, Object obj, HttpServletRequest request) {
+ log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", 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鏃犺锛�");
+ }
+ }
+
+
+ @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);
+ }
+
+ String docName = param.get鎿嶄綔鍗曟嵁();
+ boolean pakin = param.getPakin() == 1 ? true : false;
+
+ openService.syncOrder(param, pakin, docName);
+
+ return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
+
+ }
+
+ @PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "鐢熸垚鍏ュ簱鍗曟嵁")
+ public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
+ @RequestBody Map<String, Object> map,
+ HttpServletRequest request) {
+ log.info("鐢熸垚鍏ュ簱鍗曟嵁,{}", JSON.toJSONString(map));
+ OrderProdSyncParam param = JSON.parseObject(JSON.toJSONString(map), OrderProdSyncParam.class);
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getOrderNo()) && Cools.isEmpty(param.getCPOID())) {
+ return R.parse(BaseRes.PARAM);
+ }
+ String docName = param.get鎿嶄綔鍗曟嵁();
+ switch (docName) {
+ case "Purchase":
+ mappingPakOutOrderParam(param, true, "閾跺骇閲囪喘鍏ュ簱鍗�");
+ break;
+ case "MO":
+ mappingPakInOrderParam(param, true, "閾跺骇濮斿鐢熶骇璁㈠崟");
+ if (!Cools.isEmpty(param.getChildren())) {
+ mappingOrderParamChild(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�");
+ }
+ break;
+ case "OM":
+ mappingPakInOrderParam(param, true, "閾跺骇鐢熶骇璁㈠崟");
+ if (!Cools.isEmpty(param.getChildren())) {
+ mappingOrderParamChild(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�");
+ }
+ break;
+ case "閲囪喘鍏ュ簱鍗曢��璐�":
+ mappingPakOutOrderParam(param, false, "閾跺骇閲囪喘鍏ュ簱鍗曢��璐�");
+ break;
+ case "濮斿鍏ュ簱鍗曢��璐�":
+ mappingPakOutOrderParam(param, false, "閾跺骇濮斿鍏ュ簱鍗曢��璐�");
+ break;
+ case "鍏朵粬鍑哄簱鍗�":
+ mappingPakOutOrderParam(param, false, "鍏朵粬鍑哄簱鍗�");
+ break;
+ case "鍏朵粬鍏ュ簱鍗�":
+ mappingPakOutOrderParam(param, true, "鍏朵粬鍏ュ簱鍗�");
+ break;
+ case "濮斿鏉愭枡鍑哄簱閫�鏂�":
+ mappingPakOutOrderParam(param, true, "閾跺骇濮斿鏉愭枡鍑哄簱閫�鏂�");
+ break;
+ case "鐢熶骇鏉愭枡鍑哄簱閫�鏂�":
+ mappingPakOutOrderParam(param, true, "閾跺骇鐢熶骇鏉愭枡鍑哄簱閫�鏂�");
+ break;
+ case "濮斿鏉愭枡鍑哄簱琛ユ枡":
+ mappingPakOutOrderParam(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱琛ユ枡");
+ break;
+ case "鐢熶骇鏉愭枡鍑哄簱琛ユ枡":
+ mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱琛ユ枡");
+ break;
+ default:
+ log.info("鏈煡鐨勫崟鎹被鍨�:{}", param);
+ mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get鎿嶄綔鍗曟嵁());
+ break;
+ }
+
+ return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
+
+ }
+
+ /*
+ 鐩樼偣鎺ュ彛
+ */
+ @PostMapping("/check/default/v1")
+ @AppAuth(memo = "搴撳瓨鐩樼偣")
+ public synchronized R checkLoc(@RequestHeader(required = false) String appkey,
+ @RequestBody CheckParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ openService.checkAndAdjustLocDetl(param);
+
+ return R.ok("搴撳瓨璋冩暣鎴愬姛");
+
+ }
+
+ public static void main(String[] args) {
+ String jsonString = "\n" +
+ "{\"鎿嶄綔绯荤粺鍙穃": \"004\",\"鎿嶄綔鍗曟嵁\": \"Purchase\",\"鎿嶄綔绫诲瀷\": \"\",\"cPOID\":\"PO10047790\",\"cVenCode\":\"2HLSL\",\"cPersonCode\":\"\",\"cSCCode\":\"\",\"cexch_name\":\"CNY\",\"nflat\":\"1.0\",\"ddate\":\"2024-10-31 00:00:00.0\",\"cMemo\":\"鍚�2407G027\",\"states\":\"0\", \"children\": [{\"ivouchrowno\": \"1\",\"cInvCode\": \"102010400264\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1220.0000000000\",\"iTaxPrice\": \"3.250000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-1\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260272\"},{\"ivouchrowno\": \"2\",\"cInvCode\": \"102010400265\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1220.0000000000\",\"iTaxPrice\": \"3.250000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-1\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260273\"},{\"ivouchrowno\": \"3\",\"cInvCode\": \"102020100561\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1200.0000000000\",\"iTaxPrice\": \"0.150000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-1\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260274\"},{\"ivouchrowno\": \"4\",\"cInvCode\": \"102020100562\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1200.0000000000\",\"iTaxPrice\": \"0.150000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-1\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260275\"},{\"ivouchrowno\": \"5\",\"cInvCode\": \"102010101502\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1220.0000000000\",\"iTaxPrice\": \"3.000000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-2\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260276\"},{\"ivouchrowno\": \"6\",\"cInvCode\": \"102010101503\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1220.0000000000\",\"iTaxPrice\": \"3.000000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-2\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260277\"},{\"ivouchrowno\": \"7\",\"cInvCode\": \"102020100561\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1200.0000000000\",\"iTaxPrice\": \"0.150000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-2\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260278\"},{\"ivouchrowno\": \"8\",\"cInvCode\": \"102020100562\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1200.0000000000\",\"iTaxPrice\": \"0.150000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-2\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260279\"}]}";
+ OrderProdSyncParam param = new OrderProdSyncParam();
+ OrderProdSyncParam orderProdSyncParam = JSON.parseObject(jsonString, OrderProdSyncParam.class);
+ System.out.println(orderProdSyncParam.getCPOID());
+ }
+
+ @PostMapping("/order/pakout/default/v1")
+ @AppAuth(memo = "鍚屾宸ュ崟鍗曟嵁")
+ public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
+ @RequestBody Map<String, Object> map) {
+ log.info("鍚屾宸ュ崟鍗曟嵁,{}", JSON.toJSONString(map));
+ OrderProdSyncParam param = JSON.parseObject(JSON.toJSONString(map), OrderProdSyncParam.class);
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getOrderNo()) && Cools.isEmpty(param.getCPOID())) {
+ return R.parse(BaseRes.PARAM);
+ }
+ String docName = param.get鎿嶄綔鍗曟嵁();
+ switch (docName) {
+ case "Purchase":
+ mappingPakOutOrderParam(param, true, "閾跺骇閲囪喘鍏ュ簱鍗�");
+ break;
+ case "MO":
+ mappingPakInOrderParam(param, true, "閾跺骇鐢熶骇璁㈠崟");
+ if (!Cools.isEmpty(param.getChildren())) {
+ mappingOrderParamChild(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�");
+ }
+ break;
+ case "OM":
+ mappingPakInOrderParam(param, true, "閾跺骇濮斿鐢熶骇璁㈠崟");
+ if (!Cools.isEmpty(param.getChildren())) {
+ mappingOrderParamChild(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�");
+ }
+ break;
+ case "閲囪喘鍏ュ簱鍗曢��璐�":
+ mappingPakOutOrderParam(param, false, "閾跺骇閲囪喘鍏ュ簱鍗曢��璐�");
+ break;
+ case "濮斿鍏ュ簱鍗曢��璐�":
+ mappingPakOutOrderParam(param, false, "閾跺骇濮斿鍏ュ簱鍗曢��璐�");
+ break;
+ case "鍏朵粬鍑哄簱鍗�":
+ mappingPakOutOrderParam(param, false, "鍏朵粬鍑哄簱鍗�");
+ break;
+ case "鍏朵粬鍏ュ簱鍗�":
+ mappingPakOutOrderParam(param, true, "鍏朵粬鍏ュ簱鍗�");
+ break;
+ case "濮斿鏉愭枡鍑哄簱閫�鏂�":
+ mappingPakOutOrderParam(param, true, "閾跺骇濮斿鏉愭枡鍑哄簱閫�鏂�");
+ break;
+ case "鐢熶骇鏉愭枡鍑哄簱閫�鏂�":
+ mappingPakOutOrderParam(param, true, "閾跺骇鐢熶骇鏉愭枡鍑哄簱閫�鏂�");
+ break;
+ case "濮斿鏉愭枡鍑哄簱琛ユ枡":
+ mappingPakOutOrderParam(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱琛ユ枡");
+ break;
+ case "鐢熶骇鏉愭枡鍑哄簱琛ユ枡":
+ mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱琛ユ枡");
+ break;
+ default:
+ log.info("鏈煡鐨勫崟鎹被鍨�:{}", param);
+ mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get鎿嶄綔鍗曟嵁());
+ break;
+ }
+
+// if (!Cools.eq("鐢熶骇", param.getCVouchtype())) {
+// //String docName = param.getIQuantity() > 0 ? "閾跺骇濮斿鍏ュ簱鍗�" : "閾跺骇濮斿鍏ュ簱閫�璐у崟";
+// boolean pakin = param.getIQuantity() > 0 ? true : false;
+// mappingPakInOrderParam(param, pakin, param.get鎿嶄綔鍗曟嵁());
+//
+// 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, param.getChildren().get(0).get鎿嶄綔鍗曟嵁());
+// }
+//
+// } 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, param.get鎿嶄綔鍗曟嵁());
// }
- return R.ok(errorMsg).add(result);
+
+ return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
+
}
- @PostMapping("/stockOut")
- @Transactional
- public R stockOut(@RequestBody List<OpenApiStockOutParam> params){
- List<PakoutVo> result = new ArrayList<>();
- if (!Cools.isEmpty(params)) {
- for (OpenApiStockOutParam param : params) {
- // 鎺ㄨ崘璐т綅琛ヤ粨宸ヤ綔妗ｉ槻閲�
- if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("packed", param.getAllotNo()).le("wrk_sts", 14)) > 0) {
- throw new CoolException("褰撳墠琛ヤ粨浠诲姟姝ｅ湪鎵ц锛岃鑰愬績绛夊緟");
- }
- Double sumAnfme = Optional.ofNullable(locDetlService.getSumAnfme(param.getMatnr())).orElse(0.0D);
- if (!Cools.isEmpty(param.getAllotNo()) && sumAnfme < param.getAnfme()) {
- throw new CoolException("绔嬪簱搴撳瓨涓嶈冻锛岀己璐ф暟閲忥細" + (param.getAnfme() - sumAnfme));
- }
- double lack = 0.0D;
- if (sumAnfme < param.getAnfme()) {
- lack = param.getAnfme() - sumAnfme;
- PakoutVo pakoutVo = new PakoutVo();
- pakoutVo.setLocNo("缂鸿揣");
- pakoutVo.setAnfme(lack);
- pakoutVo.setMatnr(param.getMatnr());
-// pakoutVo.setZpallet("param.getZpallet()");
- result.add(pakoutVo);
+ @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) {
+ log.info("鍗曟嵁鍒犻櫎瀹℃牳,{}", JSON.toJSONString(param));
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
-// throw new CoolException(param.getMatnr() + "鐗╂枡鏁伴噺涓嶈冻锛岀己璐ф暟閲忥細" + (param.getAnfme() - sumAnfme));
- }
+ boolean success = openService.orderDelete(param.get("id").toString());
- List<LocDetl> locDetls = locDetlService.selectPakoutByRule(param.getMatnr());
- double issued = Optional.of(param.getAnfme()-lack).orElse(0.0D) ;
- for (LocDetl locDetl : locDetls) {
- if (issued > 0) {
- // 鐢熸垚鍑哄簱宸ヤ綔妗�
+ if (success) {
+ return R.ok("鍗曟嵁鍒犻櫎鎴愬姛");
+ } else {
+ return R.error("鍗曟嵁姝ｅ湪鎵ц锛屽垹闄ゅけ璐�");
+ }
- int priorCount = jdbcTemplate.queryForObject("select isnull(count(*),0) from man_prior where 1=1 and matnr = '" + param.getMatnr() + "'", Integer.class);
+ }
- // 鍏ㄦ澘
- if (issued>=locDetl.getAnfme()) {
- BasDevp staNo = basDevpService.checkSiteStatus(103);
- List<LocDetlDto> detlDtos = new ArrayList<>();
- LocDetlDto dto = new LocDetlDto();
- dto.setLocDetl(locDetl);
- dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
- detlDtos.add(dto);
- workService.stockOut(staNo, detlDtos, 101, 9527L, param.getAllotNo(), Cools.isEmpty(param.getAllotNo()), null);
- // 鎷ｆ枡
- } else {
+ private void mappingPakInOrderParam(OrderProdSyncParam param, boolean pakin, String docName) {
+ //鐢熸垚鍗曟嵁涓讳綋
+ OrderSyncParam orderSyncParam = new OrderSyncParam();
+ Synchro.Copy(param, orderSyncParam);
- if (priorCount > 0) {
- BasDevp staNo = basDevpService.checkSiteStatus(103);
- List<LocDetlDto> detlDtos = new ArrayList<>();
- LocDetlDto dto = new LocDetlDto();
- dto.setLocDetl(locDetl);
- dto.setCount(locDetl.getAnfme());
- detlDtos.add(dto);
- workService.stockOut(staNo, detlDtos, 101, 9527L, param.getAllotNo(), Cools.isEmpty(param.getAllotNo()), locDetl.getAnfme()-issued);
- } else {
- BasDevp staNo = basDevpService.checkSiteStatus(113);
- List<LocDetlDto> detlDtos = new ArrayList<>();
- LocDetlDto dto = new LocDetlDto();
- dto.setLocDetl(locDetl);
- dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
- detlDtos.add(dto);
- workService.stockOut(staNo, detlDtos, 103, 9527L, param.getAllotNo(), Cools.isEmpty(param.getAllotNo()), null);
- }
+ if (Cools.isEmpty(orderSyncParam.getCPOID())) {
+ orderSyncParam.setCPOID(param.getOrderNoT());
+ }
+ if (Cools.isEmpty(orderSyncParam.getDdate())) {
+ orderSyncParam.setDdate(param.getOrderTime());
+ }
- }
+ //鐢熸垚鍗曟嵁鏄庣粏
+ OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
+ Synchro.Copy(param, orderDetl);
+ //orderDetl.setcInvCode(param.getCInvCode());
+ //orderDetl.setiQuantity(param.getIQuantity());
+ orderDetl.setCDefine22(param.getIvouchrowno());
+ //orderDetl.setbFree1(param.getBFree1());
+ orderDetl.setId(param.getId());
+ orderDetl.setIvouchrowno(param.getIvouchrowno());
- PakoutVo pakoutVo = new PakoutVo();
- pakoutVo.setLocNo(locDetl.getLocNo());
- pakoutVo.setAnfme(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
- pakoutVo.setMatnr(locDetl.getMatnr());
- pakoutVo.setZpallet(locDetl.getZpallet());
- result.add(pakoutVo);
+ //娣诲姞鍗曟嵁鏄庣粏鍒板崟鎹富浣�
+ List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
+ orderDetls.add(orderDetl);
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- }
- }
+ 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();
+ Synchro.Copy(param, orderSyncParam);
+ if (Cools.isEmpty(orderSyncParam.getCPOID())) {
+ orderSyncParam.setCPOID(param.getOrderNoT());
+ orderSyncParam.setDdate(param.getOrderTime());
+ }
+
+ //鐢熸垚鍗曟嵁鏄庣粏
+ List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
+
+ for (OrderProdSyncParam.ChildInfo childInfo : child) {
+ OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
+ Synchro.Copy(childInfo, orderDetl);
+ //orderDetl.setcInvCode(childInfo.getCInvCode());
+ //orderDetl.setiQuantity(childInfo.getIQuantity());
+ orderDetl.setCsocode(param.getCsocode());
+ //orderDetl.setbFree1(childInfo.getBFree1());
+ orderDetl.setId(Cools.isEmpty(childInfo.getIPOsID()) ? childInfo.getId() : childInfo.getIPOsID());
+ orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
+ if (!Cools.isEmpty(childInfo.getCFree1())) {
+ orderDetl.setBFree1(childInfo.getCFree1());
}
+ orderDetls.add(orderDetl);
}
+ orderSyncParam.setChildren(orderDetls);
- return R.ok().add(result);
+ openService.syncOrder(orderSyncParam, pakin, docName);
+
+ //return orderSyncParam;
}
- @PostMapping("/available/take/site")
- @Transactional
- public R availableTakeSite(){
- List<Map<String, Object>> result = new ArrayList<>();
- List<Integer> outSite = basDevpService.getAvailableOutSite(101);
- for (Integer siteId : outSite) {
- Map<String, Object> map = new HashMap<>();
- map.put("siteId", siteId);
- map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
- result.add(map);
- }
- List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
- for (Integer siteId : pickOutSite) {
- Map<String, Object> map = new HashMap<>();
- map.put("siteId", siteId);
- map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
- result.add(map);
- }
- return R.ok().add(result);
- }
+ private void mappingOrderParamChild(OrderProdSyncParam param, boolean pakin, String docName) {
+ OrderSyncParam orderSyncParam = new OrderSyncParam();
- @PostMapping("/get/asrsLocDetl")
- @Transactional
- public R queryLocDetl(String matnr) {
- List<LocDetl> locDetls = locDetlService.getAsrsLocDetl(matnr);
- return R.ok().add(locDetls);
- }
+ List<OrderProdSyncParam.ChildInfo> child = param.getChildren();
+ Synchro.Copy(param, orderSyncParam);
+ orderSyncParam.set鎿嶄綔绯荤粺鍙�(param.get鎿嶄綔绯荤粺鍙�());
+ orderSyncParam.setCPOID(child.get(0).getOrderNoT());
+ orderSyncParam.setDdate(param.getOrderTime());
- @PostMapping("/stockOut/locMode")
- @Transactional
- public R stockOutLocMode(@RequestBody List<OpenApiStockOutParam> params){
- List<PakoutVo> result = new ArrayList<>();
- if (!Cools.isEmpty(params)) {
- for (OpenApiStockOutParam param : params) {
- // 鎺ㄨ崘璐т綅琛ヤ粨宸ヤ綔妗ｉ槻閲�
- if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("packed", param.getAllotNo()).le("wrk_sts", 14)) > 0) {
- throw new CoolException("褰撳墠琛ヤ粨浠诲姟姝ｅ湪鎵ц锛岃鑰愬績绛夊緟");
- }
- Double sumAnfme = Optional.ofNullable(locDetlService.getSumAnfme(param.getMatnr())).orElse(0.0D);
- if (!Cools.isEmpty(param.getAllotNo()) && sumAnfme < param.getAnfme()) {
- throw new CoolException("绔嬪簱搴撳瓨涓嶈冻锛岀己璐ф暟閲忥細" + (param.getAnfme() - sumAnfme));
- }
- double lack = 0.0D;
- if (sumAnfme < param.getAnfme()) {
- lack = param.getAnfme() - sumAnfme;
- PakoutVo pakoutVo = new PakoutVo();
- pakoutVo.setLocNo("缂鸿揣");
- pakoutVo.setAnfme(lack);
- pakoutVo.setMatnr(param.getMatnr());
-// pakoutVo.setZpallet("param.getZpallet()");
- result.add(pakoutVo);
+ //鐢熸垚鍗曟嵁鏄庣粏
+ List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
-// throw new CoolException(param.getMatnr() + "鐗╂枡鏁伴噺涓嶈冻锛岀己璐ф暟閲忥細" + (param.getAnfme() - sumAnfme));
- }
-
- // 鏍规嵁绔嬪簱搴撲綅鐮佸幓鑾峰彇绔嬪簱淇℃伅
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", param.getLocNo()));
- if (locDetls.size() == 0) {
- throw new CoolException("鏈煡璇㈠埌搴撲綅淇℃伅锛�");
- }
- double issued = Optional.of(param.getAnfme()-lack).orElse(0.0D) ;
- for (LocDetl locDetl : locDetls) {
- // 鐢熸垚鍑哄簱宸ヤ綔妗�
-
- Integer locNoNum = locDetlService.countLocNoNum(locDetl.getLocNo());
- // 鍏ㄦ澘
- if (locNoNum == 1) {
- BasDevp staNo = basDevpService.checkSiteStatus(103);
- List<LocDetlDto> detlDtos = new ArrayList<>();
- LocDetlDto dto = new LocDetlDto();
- dto.setLocDetl(locDetl);
- dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
- detlDtos.add(dto);
- workService.stockOut(staNo, detlDtos, 101, 9527L, param.getAllotNo(), Cools.isEmpty(param.getAllotNo()), null);
- } else { // 鎷ｆ枡
- BasDevp staNo = basDevpService.checkSiteStatus(107);
- List<LocDetlDto> detlDtos = new ArrayList<>();
- LocDetlDto dto = new LocDetlDto();
- dto.setLocDetl(locDetl);
- dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
- detlDtos.add(dto);
- workService.stockOut(staNo, detlDtos, 103, 9527L, param.getAllotNo(), Cools.isEmpty(param.getAllotNo()), null);
- }
- PakoutVo pakoutVo = new PakoutVo();
- pakoutVo.setLocNo(locDetl.getLocNo());
- pakoutVo.setAnfme(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
- pakoutVo.setMatnr(locDetl.getMatnr());
- pakoutVo.setZpallet(locDetl.getZpallet());
- result.add(pakoutVo);
-
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- }
-
+ for (OrderProdSyncParam.ChildInfo childInfo : child) {
+ OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
+ Synchro.Copy(childInfo, orderDetl);
+ orderDetl.setCDefine22(param.getIvouchrowno());
+ orderDetl.setCsocode(param.getCsocode());
+ orderDetl.setId(childInfo.getIds());
+ //orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
+ if (!Cools.isEmpty(childInfo.getCFree1())) {
+ orderDetl.setBFree1(childInfo.getCFree1());
}
+ orderDetls.add(orderDetl);
}
+ orderSyncParam.setChildren(orderDetls);
- return R.ok().add(result);
+ openService.syncOrder(orderSyncParam, pakin, docName);
+
+ //return orderSyncParam;
}
}
--
Gitblit v1.9.1