From dc24e8e11dd2f17967fac7809ba40688162f8e9e Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 04 六月 2024 15:34:08 +0800
Subject: [PATCH] # 库位初始化
---
src/main/java/com/zy/asrs/controller/OpenController.java | 648 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 395 insertions(+), 253 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 9f69496..7b763f5 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,293 +1,435 @@
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.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);
- 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("/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);
}
-// if (error) {
-// return R.error(errorMsg.toString());
+ 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));
+ }
+
+
+ /**
+ * 搴撳瓨缁熻
+ */
+ @RequestMapping("/stock/default/v1")
+ public R queryStock(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ return R.ok().add(openService.queryStock());
+ }
+
+ /**
+ * 鍟嗗搧淇℃伅鍚屾鎺ュ彛
+ */
+ @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);
+ }
+ openService.syncMat(param);
+
+ return R.ok("鏇存柊鎴愬姛");
+
+ }
+
+ /**
+ * 鍏ュ簱閫氱煡妗ｇ敓鎴�
+ */
+ @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());
+ }
+
+
+ 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/matSync/default/v1")
+ public synchronized R syncMatInfoU8(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) Map<String, Object> param,
+ HttpServletRequest request){
+ 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;
+ }
+ 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(";");
+ }
+ }
+ 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);
+ }
+
+// 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(errorMsg).add(result);
+
}
- @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/pak/default/v1")
+ @AppAuth(memo = "鐢熸垚閫�璐цˉ璐у崟鎹�")
+ public synchronized R orderAccept(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = true) OrderSyncParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
-// throw new CoolException(param.getMatnr() + "鐗╂枡鏁伴噺涓嶈冻锛岀己璐ф暟閲忥細" + (param.getAnfme() - sumAnfme));
- }
+ String docName = param.get鎿嶄綔鍗曟嵁();
+ boolean pakin = param.getPakin() == 1 ? true : false;
- List<LocDetl> locDetls = locDetlService.selectPakoutByRule(param.getMatnr());
- double issued = Optional.of(param.getAnfme()-lack).orElse(0.0D) ;
- for (LocDetl locDetl : locDetls) {
- if (issued > 0) {
- // 鐢熸垚鍑哄簱宸ヤ綔妗�
+ openService.syncOrder(param,pakin,docName);
- int priorCount = jdbcTemplate.queryForObject("select isnull(count(*),0) from man_prior where 1=1 and matnr = '" + param.getMatnr() + "'", Integer.class);
+ return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
- // 鍏ㄦ澘
- 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 {
+ }
- 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);
- }
+ @PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "鐢熸垚鍏ュ簱鍗曟嵁")
+ public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = true) OrderSyncParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
- }
+ String docName = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇閲囪喘鍏ュ簱鍗�" : "閾跺骇閲囪喘閫�璐у崟";
+ boolean pakin = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
- 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);
+ openService.syncOrder(param,pakin,docName);
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- }
- }
+ 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){
+
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ 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().add(result);
+ return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
+
}
- @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);
- }
-
- @PostMapping("/get/asrsLocDetl")
- @Transactional
- public R queryLocDetl(String matnr) {
- List<LocDetl> locDetls = locDetlService.getAsrsLocDetl(matnr);
- return R.ok().add(locDetls);
- }
-
- @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);
-
-// 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()));
- } 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()));
- }
- 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();
- }
-
- }
+ @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){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
}
- return R.ok().add(result);
+ boolean success = openService.orderDelete(param.get("id").toString());
+
+ if(success){
+ return R.ok("鍗曟嵁鍒犻櫎鎴愬姛");
+ }else {
+ return R.error("鍗曟嵁姝ｅ湪鎵ц锛屽垹闄ゅけ璐�");
+ }
+
}
+
+ 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("");
+
+ //鐢熸垚鍗曟嵁鏄庣粏
+ 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;
+ }
+
}
--
Gitblit v1.9.1