From 1b43abdddc83ee73315a44481c4abd66ee545ca6 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期一, 20 十月 2025 08:32:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 673 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 548 insertions(+), 125 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 0feb909..422306c 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -2,30 +2,27 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.core.common.DateUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.MatUtils;
+import com.zy.asrs.utils.MathUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
-import com.zy.common.constant.MesConstant;
-import com.zy.common.model.MesPakinParam;
-import com.zy.common.model.MesPakoutParam;
-import com.zy.common.utils.HttpHandler;
+import com.zy.common.model.DetlDto;
+import com.zy.nc.entity.NccSaleDbddWms;
+import com.zy.nc.entity.NccSaleXsfhmxWms;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
/**
* Created by vincent on 2020/7/7
@@ -40,138 +37,564 @@
private OrderService orderService;
@Autowired
private OrderDetlService orderDetlService;
+
@Autowired
- private ApiLogService apiLogService;
+ private OrderDetlPakoutService orderDetlPakoutService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
+
@Autowired
private DocTypeService docTypeService;
+ @Autowired
+ private ReportToThirdService reportToThirdService;
+
+ @Transactional
+ public ReturnT<String> startOrderIssuedOnceMore(Order order) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (null == docType) {
+ return SUCCESS;
+ }
+
+ Order order1 = OrderInAndOutUtil.selectByNo(order.getPakinPakoutStatus$(), order.getOrderNo());
+ if (!Cools.isEmpty(order1)) {
+ return FAIL.setMsg("璇风瓑寰�...璁㈠崟鎵ц妗ｆ姝ｅ湪杞巻鍙叉。妗堬紒锛侊紒");
+ }
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
+ if (!Cools.isEmpty(orderDetls) || !orderDetls.isEmpty()) {
+ return FAIL.setMsg("璇风瓑寰�...璁㈠崟鎵ц鏄庣粏妗ｆ姝ｅ湪杞巻鍙叉。妗堬紒锛侊紒");
+ }
+
+ // 鍗曟嵁鏄庣粏妗�
+ List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
+ for (OrderDetl orderDetl : orderDetlList) {
+ if (orderDetl.getQty().equals(0D)) {
+ continue;
+ }
+ orderDetl.setWorkQty(orderDetl.getQty());
+ orderDetl.setAnfme(MathUtils.subtract(orderDetl.getAnfme(), orderDetl.getQty()));
+ orderDetl.setQty(0D);
+ orderDetlService.updateById(orderDetl);
+ }
+
+ // 淇敼璁㈠崟鐘舵�� 99.鍐嶆浣滀笟 ===>> 1.寰呬綔涓�
+ if (!orderService.updateSettle(order.getId(), 1L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ return SUCCESS;
+ }
+
+ @Transactional
+ public ReturnT<String> startOrderIssued(Order order) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (null == docType) {
+ return SUCCESS;
+ }
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+
+ OrderInAndOutUtil.insertOrder(order.getPakinPakoutStatus$(), order);
+ // 鍗曟嵁鏄庣粏妗�
+ List<DetlDto> list = new ArrayList<>();
+ List<OrderDetl> orderDetlList = new ArrayList<>();
+
+ for (OrderDetl detail : orderDetls) {
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
+ dto.setOrderNo(detail.getOrderNo());
+ if (DetlDto.has(list, dto)) {
+ DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
+ assert detlDto != null;
+ detlDto.setAnfme(MathUtils.add(detlDto.getAnfme(), detail.getAnfme()));
+
+ OrderDetl orderDetl = OrderDetl.find(orderDetlList, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
+ assert orderDetl != null;
+ orderDetl.setAnfme(MathUtils.add(orderDetl.getAnfme(), detail.getAnfme()));
+ Double weight = MatUtils.calcWeight(orderDetl.getMatnr(), orderDetl.getAnfme());
+ orderDetl.setWeight(weight);
+ } else {
+ list.add(dto);
+ orderDetlList.add(detail);
+ }
+ }
+ for (OrderDetl orderDetl : orderDetlList) {
+ orderDetl.setWorkQty(0D);
+ OrderInAndOutUtil.insertOrderDetl(order.getPakinPakoutStatus$(), order, orderDetl);
+ }
+ // 淇敼璁㈠崟鐘舵�� 1.鏈綔涓� ===>> 2.浣滀笟涓�
+ if (!orderService.updateSettle(order.getId(), 2L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ return SUCCESS;
+ }
+
@Transactional
public ReturnT<String> startOrderInAndOutUtil(Order order) {
DocType docType = docTypeService.selectById(order.getDocType());
if (null == docType) {
return SUCCESS;
}
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
- Order orderNew = new Order(order);
- orderService.insert(orderNew);
- for (OrderDetl orderDetl : orderDetls){
- OrderDetl orderDetlNew = new OrderDetl(orderDetl);
- orderDetlService.insert(orderDetlNew);
+ if (docType.getDocName().equals("閿�鍞彂璐�") || docType.getDocName().equals("闆嗗洟鍐呴儴璋冩嫧")) {
+ return SUCCESS;
}
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ Order orderSou = orderService.selectByNo(order.getOrderNo());
+ if (orderSou == null) {
+ return FAIL.setMsg(order.getOrderNo() + "璁㈠崟涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳");
+ }
+ if (!orderSou.getSettle().equals(2L)) {
+ return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
+ }
+ List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(orderSou.getId());
+
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
+
+ for (OrderDetl orderDetlSou : orderDetlList) {
+ for (OrderDetl orderDetl : orderDetls) {
+ if (orderDetl.getQty().equals(0D)) {
+ continue;
+ }
+ if (orderDetlSou.beSimilar(orderDetl)) {
+ double v = MathUtils.subtract(orderDetlSou.getAnfme(), orderDetlSou.getQty());
+ if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
+ orderDetlSou.setQty(orderDetlSou.getAnfme());
+ orderDetl.setQty(orderDetl.getQty() - v);
+ break;
+ } else {
+ orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
+ orderDetl.setQty(0D);
+ }
+ }
+ }
+ }
+ for (OrderDetl orderDetlSou : orderDetlList) {
+ orderDetlService.updateById(orderDetlSou);
+ }
+ // 淇敼璁㈠崟鐘舵�� 2.浣滀笟涓� ===>> 4.寰呬笂鎶�
+ if (!orderService.updateSettle(orderSou.getId(), 4L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.缁撴潫
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
return SUCCESS;
}
+
@Transactional
- public ReturnT<String> startOrder(Order order) {
+ public ReturnT<String> checkXSFH(Order order) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (null == docType) {
+ return SUCCESS;
+ }
+ if (!docType.getDocName().equals("閿�鍞彂璐�")) {
+ return SUCCESS;
+ }
+ Order orderSou = orderService.selectByNo(order.getOrderNo());
+ if (orderSou == null) {
+ return FAIL.setMsg("璁㈠崟涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳");
+ }
+ if (!orderSou.getSettle().equals(2L)) {
+ return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
+ boolean complete = true;
+// for (OrderDetl orderDetl : orderDetls) {
+// if (orderDetl.getAnfme() > orderDetl.getQty()) {
+// complete = false;
+// break;
+// }
+// }
+ if (complete) {
+ List<OrderDetl> old = orderDetlService.selectByOrderId(orderSou.getId());
+ if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", order.getOrderNo()))) {
+ throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+ }
+
+ HashMap<String, List<NccSaleXsfhmxWms>> matnrMap = new HashMap<>();
+ for (OrderDetl orderDetl : old) {
+ String remark = orderDetl.getRemark();
+ if(Cools.isEmpty(remark)) {
+ continue;
+ }
+
+ NccSaleXsfhmxWms currentData = JSONObject.parseObject(orderDetl.getRemark(), NccSaleXsfhmxWms.class);
+ if (currentData == null) {
+ continue;
+ }
+
+ List<NccSaleXsfhmxWms> list = new ArrayList<>();
+ if (matnrMap.containsKey(orderDetl.getMatnr())) {
+ list = matnrMap.get(orderDetl.getMatnr());
+ list.add(currentData);
+ }else {
+ list.add(currentData);
+ }
+ matnrMap.put(orderDetl.getMatnr(), list);
+ }
+
+ for (Map.Entry<String, List<NccSaleXsfhmxWms>> entry : matnrMap.entrySet()) {
+ String matnr = entry.getKey();
+ List<NccSaleXsfhmxWms> list = entry.getValue();
+ list.sort(Comparator.comparing(NccSaleXsfhmxWms::getNastnum).reversed());
+ matnrMap.put(matnr, list);
+ }
+
+ List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(order.getOrderNo());
+ for (WrkDetl wrkDetl : wrkDetls) {
+ List<OrderDetl> insertList = new ArrayList<>();
+
+ Double isused = wrkDetl.getWeight();
+ while (isused > 0D) {
+ List<NccSaleXsfhmxWms> list = matnrMap.get(wrkDetl.getMatnr());
+ if (!list.isEmpty()) {
+ NccSaleXsfhmxWms nccSaleXsfhmxWms = list.get(0);
+ BigDecimal orderStock = nccSaleXsfhmxWms.getNastnum();
+
+ //瀹為檯鍑哄簱鏁伴噺
+ double realWeight = 0D;
+ BigDecimal diff = orderStock.subtract(BigDecimal.valueOf(isused));
+ if (diff.doubleValue() >= 0) {
+ nccSaleXsfhmxWms.setNastnum(diff);
+ list.set(0, nccSaleXsfhmxWms);
+ matnrMap.put(wrkDetl.getMatnr(), list);
+ realWeight = isused;
+ }else {
+ list.remove(0);
+ matnrMap.put(wrkDetl.getMatnr(), list);
+ realWeight = orderStock.doubleValue();
+ }
+
+ //璁＄畻涓绘暟閲�
+ Double anfme = MatUtils.calcAnfmeFromWeight(wrkDetl.getMatnr(), realWeight);
+
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(wrkDetl);
+ orderDetl.setQty(anfme);
+ orderDetl.setWeight(realWeight);
+ orderDetl.setOrderId(orderSou.getId());
+ orderDetl.setOrderNo(orderSou.getOrderNo());
+ orderDetl.setStatus(1);
+ orderDetl.setCreateTime(orderSou.getCreateTime());
+ orderDetl.setCreateBy(orderSou.getCreateBy());
+ orderDetl.setUpdateTime(orderSou.getUpdateTime());
+ orderDetl.setUpdateBy(orderSou.getUpdateBy());
+ orderDetl.setId(null);
+ orderDetl.setRemark(JSON.toJSONString(nccSaleXsfhmxWms));
+ insertList.add(orderDetl);
+
+ isused -= orderStock.doubleValue();
+ }else {
+ throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐ワ紝ERP鍘熷鏁版嵁涓虹┖");
+ }
+ }
+
+ for (OrderDetl orderDetl : insertList) {
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+ }
+ }
+ }
+
+// for (WrkDetl wrkDetl : wrkDetls) {
+// OrderDetl orderDetl = new OrderDetl();
+// orderDetl.sync(wrkDetl);
+// orderDetl.setQty(wrkDetl.getAnfme());
+// orderDetl.setOrderId(orderSou.getId());
+// orderDetl.setOrderNo(orderSou.getOrderNo());
+// orderDetl.setStatus(1);
+// orderDetl.setCreateTime(orderSou.getCreateTime());
+// orderDetl.setCreateBy(orderSou.getCreateBy());
+// orderDetl.setUpdateTime(orderSou.getUpdateTime());
+// orderDetl.setUpdateBy(orderSou.getUpdateBy());
+// orderDetl.setId(null);
+// //鍏堟寜鐓ф壒娆″尮閰嶏紝鍐嶆寜鐓ф棤鎵规鍙锋壒娆★紝鍥犱负閿�鍞彂璐э紝鎵规鍙峰彲鑳藉甫锛屾湁鍙兘涓嶆惡甯︼紝鎵�浠ュ氨浼氭湁闂锛涜�屼笖鑰冭檻鍒颁竴鏉¤鍗曢噷濡傛灉鐩稿悓鐗╂枡锛屼竴鏉″甫鎵规锛屼竴鏉′笉甯︽壒娆★紝鎯呭喌
+// for (OrderDetl xxx : old) {
+// if (xxx.beSimilar(wrkDetl)) {
+// if(Cools.isEmpty(orderDetl.getRemark())) {
+// orderDetl.setRemark(xxx.getRemark());
+// }else {
+// NccSaleXsfhmxWms currentData = JSONObject.parseObject(orderDetl.getRemark(), NccSaleXsfhmxWms.class);
+// if (currentData == null) {
+// continue;
+// }
+//
+// NccSaleXsfhmxWms nextData = JSONObject.parseObject(xxx.getRemark(), NccSaleXsfhmxWms.class);
+// if (nextData == null) {
+// continue;
+// }
+//
+// BigDecimal currentFslDecimal = currentData.getNastnum();
+// BigDecimal nextFslDecimal = nextData.getNastnum();
+// if(currentFslDecimal.doubleValue() < nextFslDecimal.doubleValue()) {
+// orderDetl.setRemark(xxx.getRemark());
+// }
+// }
+// }
+// }
+// if (Cools.isEmpty(orderDetl.getRemark())) {
+// for (OrderDetl xxx : old) {
+// if (xxx.beSimilarByWrkDetl(wrkDetl)) {
+// if(Cools.isEmpty(orderDetl.getRemark())) {
+// orderDetl.setRemark(xxx.getRemark());
+// }else {
+// NccSaleXsfhmxWms currentData = JSONObject.parseObject(orderDetl.getRemark(), NccSaleXsfhmxWms.class);
+// if (currentData == null) {
+// continue;
+// }
+//
+// NccSaleXsfhmxWms nextData = JSONObject.parseObject(xxx.getRemark(), NccSaleXsfhmxWms.class);
+// if (nextData == null) {
+// continue;
+// }
+//
+// BigDecimal currentFslDecimal = currentData.getNastnum();
+// BigDecimal nextFslDecimal = nextData.getNastnum();
+// if(currentFslDecimal.doubleValue() < nextFslDecimal.doubleValue()) {
+// orderDetl.setRemark(xxx.getRemark());
+// }
+// }
+// }
+// }
+//
+// if (Cools.isEmpty(orderDetl.getRemark())) {
+// throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐ワ紝ERP鍘熷鏁版嵁涓虹┖");
+// }
+// }
+// if (!orderDetlService.insert(orderDetl)) {
+// throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+// }
+// }
+
+ // 淇敼璁㈠崟鐘舵�� 2.浣滀笟涓� ===>> 4.寰呬笂鎶�
+ if (!orderService.updateSettle(orderSou.getId(), 4L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.缁撴潫
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
+ }
+ return SUCCESS;
+ }
+
+ @Transactional
+ public ReturnT<String> checkDBDD(Order order) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (null == docType) {
+ return SUCCESS;
+ }
+ if (!docType.getDocName().equals("闆嗗洟鍐呴儴璋冩嫧")) {
+ return SUCCESS;
+ }
+ Order orderSou = orderService.selectByNo(order.getOrderNo());
+ if (orderSou == null) {
+ return FAIL.setMsg("璁㈠崟涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳");
+ }
+ if (!orderSou.getSettle().equals(2L)) {
+ return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
+ boolean complete = true;
+// for (OrderDetl orderDetl : orderDetls) {
+// if (orderDetl.getAnfme() > orderDetl.getQty()) {
+// complete = false;
+// break;
+// }
+// }
+ if (complete) {
+ List<OrderDetl> old = orderDetlService.selectByOrderId(orderSou.getId());
+ if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", order.getOrderNo()))) {
+ throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+ }
+
+ HashMap<String, List<NccSaleDbddWms>> matnrMap = new HashMap<>();
+ for (OrderDetl orderDetl : old) {
+ String remark = orderDetl.getRemark();
+ if(Cools.isEmpty(remark)) {
+ continue;
+ }
+
+ NccSaleDbddWms currentData = JSONObject.parseObject(orderDetl.getRemark(), NccSaleDbddWms.class);
+ if (currentData == null) {
+ continue;
+ }
+
+ List<NccSaleDbddWms> list = new ArrayList<>();
+ if (matnrMap.containsKey(orderDetl.getMatnr())) {
+ list = matnrMap.get(orderDetl.getMatnr());
+ list.add(currentData);
+ }else {
+ list.add(currentData);
+ }
+ matnrMap.put(orderDetl.getMatnr(), list);
+ }
+
+ for (Map.Entry<String, List<NccSaleDbddWms>> entry : matnrMap.entrySet()) {
+ String matnr = entry.getKey();
+ List<NccSaleDbddWms> list = entry.getValue();
+ list.sort(Comparator.comparing(NccSaleDbddWms::getFsl).reversed());
+ matnrMap.put(matnr, list);
+ }
+
+ List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(order.getOrderNo());
+ for (WrkDetl wrkDetl : wrkDetls) {
+ List<OrderDetl> insertList = new ArrayList<>();
+
+ Double isused = wrkDetl.getWeight();
+ while (isused > 0D) {
+ List<NccSaleDbddWms> list = matnrMap.get(wrkDetl.getMatnr());
+ if (!list.isEmpty()) {
+ NccSaleDbddWms nccSaleDbddWms = list.get(0);
+ BigDecimal orderStock = nccSaleDbddWms.getFsl();
+
+ //瀹為檯鍑哄簱鏁伴噺
+ double realWeight = 0D;
+ BigDecimal diff = orderStock.subtract(BigDecimal.valueOf(isused));
+ if (diff.doubleValue() >= 0) {
+ nccSaleDbddWms.setFsl(diff);
+ list.set(0, nccSaleDbddWms);
+ matnrMap.put(wrkDetl.getMatnr(), list);
+ realWeight = isused;
+ }else {
+ list.remove(0);
+ matnrMap.put(wrkDetl.getMatnr(), list);
+ realWeight = orderStock.doubleValue();
+ }
+
+ //璁＄畻涓绘暟閲�
+ Double anfme = MatUtils.calcAnfmeFromWeight(wrkDetl.getMatnr(), realWeight);
+
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(wrkDetl);
+ orderDetl.setQty(anfme);
+ orderDetl.setWeight(realWeight);
+ orderDetl.setOrderId(orderSou.getId());
+ orderDetl.setOrderNo(orderSou.getOrderNo());
+ orderDetl.setStatus(1);
+ orderDetl.setCreateTime(orderSou.getCreateTime());
+ orderDetl.setCreateBy(orderSou.getCreateBy());
+ orderDetl.setUpdateTime(orderSou.getUpdateTime());
+ orderDetl.setUpdateBy(orderSou.getUpdateBy());
+ orderDetl.setId(null);
+ orderDetl.setRemark(JSON.toJSONString(nccSaleDbddWms));
+ insertList.add(orderDetl);
+
+ isused -= orderStock.doubleValue();
+ }else {
+ throw new CoolException("閲嶆暣璋冩嫧鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐ワ紝ERP鍘熷鏁版嵁涓虹┖");
+ }
+ }
+
+ for (OrderDetl orderDetl : insertList) {
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("閲嶆暣璋冩嫧鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+ }
+ }
+ }
+
+// List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(order.getOrderNo());
+// for (WrkDetl wrkDetl : wrkDetls) {
+// OrderDetl orderDetl = new OrderDetl();
+// orderDetl.sync(wrkDetl);
+// orderDetl.setQty(wrkDetl.getAnfme());
+// orderDetl.setOrderId(orderSou.getId());
+// orderDetl.setOrderNo(orderSou.getOrderNo());
+// orderDetl.setStatus(1);
+// orderDetl.setCreateTime(orderSou.getCreateTime());
+// orderDetl.setCreateBy(orderSou.getCreateBy());
+// orderDetl.setUpdateTime(orderSou.getUpdateTime());
+// orderDetl.setUpdateBy(orderSou.getUpdateBy());
+// orderDetl.setId(null);
+// //鍏堟寜鐓ф壒娆″尮閰嶏紝鍐嶆寜鐓ф棤鎵规鍙锋壒娆★紝鍥犱负閿�鍞彂璐э紝鎵规鍙峰彲鑳藉甫锛屾湁鍙兘涓嶆惡甯︼紝鎵�浠ュ氨浼氭湁闂锛涜�屼笖鑰冭檻鍒颁竴鏉¤鍗曢噷濡傛灉鐩稿悓鐗╂枡锛屼竴鏉″甫鎵规锛屼竴鏉′笉甯︽壒娆★紝鎯呭喌
+// for (OrderDetl xxx : old) {
+// if (xxx.beSimilar(wrkDetl)) {
+// if(Cools.isEmpty(orderDetl.getRemark())) {
+// orderDetl.setRemark(xxx.getRemark());
+// }else {
+// NccSaleDbddWms currentData = JSONObject.parseObject(orderDetl.getRemark(), NccSaleDbddWms.class);
+// if (currentData == null) {
+// continue;
+// }
+//
+// NccSaleDbddWms nextData = JSONObject.parseObject(xxx.getRemark(), NccSaleDbddWms.class);
+// if (nextData == null) {
+// continue;
+// }
+//
+// BigDecimal currentFslDecimal = currentData.getFsl();
+// BigDecimal nextFslDecimal = nextData.getFsl();
+// if(currentFslDecimal.doubleValue() < nextFslDecimal.doubleValue()) {
+// orderDetl.setRemark(xxx.getRemark());
+// }
+// }
+// }
+// }
+// if (Cools.isEmpty(orderDetl.getRemark())) {
+// for (OrderDetl xxx : old) {
+// if (xxx.beSimilarByWrkDetl(wrkDetl)) {
+// if(Cools.isEmpty(orderDetl.getRemark())) {
+// orderDetl.setRemark(xxx.getRemark());
+// }else {
+// NccSaleDbddWms currentData = JSONObject.parseObject(orderDetl.getRemark(), NccSaleDbddWms.class);
+// if (currentData == null) {
+// continue;
+// }
+//
+// NccSaleDbddWms nextData = JSONObject.parseObject(xxx.getRemark(), NccSaleDbddWms.class);
+// if (nextData == null) {
+// continue;
+// }
+//
+// BigDecimal currentFslDecimal = currentData.getFsl();
+// BigDecimal nextFslDecimal = nextData.getFsl();
+// if(currentFslDecimal.doubleValue() < nextFslDecimal.doubleValue()) {
+// orderDetl.setRemark(xxx.getRemark());
+// }
+// }
+// }
+// }
+//
+// if (Cools.isEmpty(orderDetl.getRemark())) {
+// throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐ワ紝ERP鍘熷鏁版嵁涓虹┖");
+// }
+// }
+// if (!orderDetlService.insert(orderDetl)) {
+// throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+// }
+// }
+
+ // 淇敼璁㈠崟鐘舵�� 2.浣滀笟涓� ===>> 4.寰呬笂鎶�
+ if (!orderService.updateSettle(orderSou.getId(), 4L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.缁撴潫
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
+ }
+ return SUCCESS;
+ }
+
+
+ @Transactional
+ public ReturnT<String> startOrderReport(Order order) {
DocType docType = docTypeService.selectById(order.getDocType());
if (null == docType) {
return SUCCESS;
}
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- // 鍏ュ簱瀹屾垚涓婃姤
- if (docType.getPakin() == 1) {
- MesPakinParam pakinParam = new MesPakinParam();
- pakinParam.setPakinTime(DateUtils.convert(order.getUpdateTime()));
- pakinParam.setLgortFrom("5008");
- pakinParam.setLgortTo("5006");
- for (OrderDetl orderDetl : orderDetls) {
- String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
- pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
- }
- String response = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PAKIN_URL)
- .setJson(JSON.toJSONString(pakinParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鎴愬搧搴撳叆搴撲笂鎶�",
- MesConstant.URL + MesConstant.PAKIN_URL,
- null,
- "127.0.0.1",
- JSON.toJSONString(pakinParam),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
- }
- }
- // 鍑哄簱瀹屾垚涓婃姤
- if (docType.getPakout() == 1) {
- MesPakoutParam pakoutParam = new MesPakoutParam();
- pakoutParam.setTag(!order.getDocType$().equalsIgnoreCase("鎵嬪姩鍑哄簱鍗�"));
- pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime()));
- pakoutParam.setLgortFrom("5006");
- pakoutParam.setLgortTo("1111");
- if (!pakoutParam.isTag()) {
- pakoutParam.setKunnr("C1000");
- }
- pakoutParam.setOrderNo(order.getOrderNo());
- for (OrderDetl orderDetl : orderDetls) {
- String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
- pakoutParam.getList().add(new MesPakoutParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
- }
- String response = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PAKOUT_URL)
- .setJson(JSON.toJSONString(pakoutParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鎴愬搧搴撳嚭搴撲笂鎶�",
- MesConstant.URL + MesConstant.PAKOUT_URL,
- null,
- "127.0.0.1",
- JSON.toJSONString(pakoutParam),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
- }
+ try {
+ reportToThirdService.report(order, orderDetls, docType);
+ } catch (Exception e) {
+ return FAIL;
}
return SUCCESS;
}
+
+ @Transactional
+ public ReturnT<String> reportCheck(InventoryCheckOrder checkOrder) {
+ List<InventoryCheckOrderDetl> checkOrderDetls = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no", checkOrder.getOrderNo()));
+ for (InventoryCheckOrderDetl checkOrderDetl : checkOrderDetls) {
+
+ }
+ return SUCCESS;
+ }
}
--
Gitblit v1.9.1