From f268121e9fe9116c19f84412b3ea992d68acf542 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 18 七月 2025 14:05:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 105 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
index a25dfff..0384f8b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
@@ -26,6 +26,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.sql.SQLException;
import java.sql.Wrapper;
import java.text.SimpleDateFormat;
@@ -77,6 +79,7 @@
String storageRegion = "";
String remark = "";
String container = "";
+ int decValue = 0;
if (object.get("remark") != null) {
remark = object.get("remark").toString();
}
@@ -95,6 +98,9 @@
if (object.get("userId") != null) {
userId = object.get("userId").toString();
}
+ if (object.get("decValue") != null) {
+ decValue = Integer.parseInt(object.get("decValue").toString());
+ }
Log log = new Log();
log.setOperator(userName);
log.setOperatorId(userId);
@@ -107,9 +113,52 @@
if (!flowCardlist.isEmpty()){
//鑾峰彇鍗曞彿
String oddNumber= orderNumberSetting("鍏ュ簱");
- for (FlowCard flowCard : flowCardlist) {
+ for (FlowCard flowCards : flowCardlist) {
+ FlowCard flowCard = finishedGoodsInventoryMapper.getSelectWarehousingByProcessId(flowCards.getOrder().getOrderId(),flowCards.getOrderNumber(),flowCards.getProcessId());
+ Integer calculateType=flowCard.getOrder().getCalculateType();
+ double deliveryDetailMoney = 0.0;
+ double deliveryDetailArea = 0.0;
+ BigDecimal getComputeArea= BigDecimal.valueOf(flowCard.getOrderDetail().getComputeArea());
+ BigDecimal getQuantity= BigDecimal.valueOf(flowCard.getInventoryQuantity());
+ BigDecimal getPrice= BigDecimal.valueOf(flowCard.getOrderDetail().getPrice());
+ BigDecimal getWidth= BigDecimal.valueOf(flowCard.getOrderDetail().getWidth());
+ BigDecimal getHeight= BigDecimal.valueOf(flowCard.getOrderDetail().getHeight());
+ BigDecimal singlePieceArea =getComputeArea.multiply(getQuantity).setScale(decValue, RoundingMode.HALF_UP)
+ .multiply(getPrice).setScale(2, RoundingMode.HALF_UP);
+ //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
+ if (calculateType==1){
+ deliveryDetailMoney=singlePieceArea.doubleValue();
+ deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
+
+ }else if (calculateType==2){
+ //鍒ゆ柇瀹為檯鍗曠墖闈㈢Н璺熺粨绠楀崟鐗囬潰绉槸鍚︾浉绛� 缁撶畻鎬婚潰绉窡瀹為檯鎬婚潰绉槸鍚︾浉绛�
+ if(Objects.equals(flowCard.getOrderDetail().getArea(), flowCard.getOrderDetail().getComputeArea())&&Objects.equals(flowCard.getOrderDetail().getGrossArea(), flowCard.getOrderDetail().getComputeGrossArea())){
+ deliveryDetailMoney=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), decValue, RoundingMode.HALF_UP)
+ .multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), decValue, RoundingMode.HALF_UP).doubleValue();
+ }else{
+ deliveryDetailMoney=singlePieceArea.doubleValue();
+ deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
+ }
+ }else if (calculateType==3){
+ deliveryDetailMoney=getQuantity.multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
+
+ }else if (calculateType==4){
+ //鍒ゆ柇瀹為檯鍗曠墖闈㈢Н璺熺粨绠楀崟鐗囬潰绉槸鍚︾浉绛� 缁撶畻鎬婚潰绉窡瀹為檯鎬婚潰绉槸鍚︾浉绛�
+ if(Objects.equals(flowCard.getOrderDetail().getArea(), flowCard.getOrderDetail().getComputeArea())&&Objects.equals(flowCard.getOrderDetail().getGrossArea(), flowCard.getOrderDetail().getComputeGrossArea())){
+ deliveryDetailMoney=getWidth.multiply(getHeight).multiply(getQuantity).multiply(getPrice).
+ divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), decValue, RoundingMode.HALF_UP).doubleValue();
+ }else{
+ deliveryDetailMoney=getComputeArea.multiply(getQuantity).multiply(getPrice).setScale(decValue, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
+ }
+ }
+
+
//娣诲姞鍑哄叆搴撹褰�
- finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber,container);
+ finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber,container,deliveryDetailMoney,deliveryDetailArea);
Integer finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdcount(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber());
Integer ordersum = finishedGoodsInventoryMapper.findOrderQuantity(flowCard.getOrder().getOrderId());
Integer ordernumbersum = finishedGoodsInventoryMapper.findOrderNumberdsum(flowCard.getOrder().getOrderId());
@@ -119,7 +168,7 @@
/*System.out.println("璁㈠崟鎬绘暟:" + ordersum + "宸插叆搴撴暟閲忥細" + ordernumbersum + "鍑嗗鍏ュ簱鏁伴噺" + flowCard.getInventoryQuantity());*/
if (finishedGoodsInventorycount > 0) {
//淇敼搴撳瓨琛ㄥ叆搴撴暟閲�
- finishedGoodsInventoryMapper.updateInventory(flowCard,storageRegion, remark);
+ finishedGoodsInventoryMapper.updateInventory(flowCard,storageRegion, remark,container);
//淇敼娴佺▼鍗¤〃鍏ュ簱鏁伴噺
finishedGoodsInventoryMapper.updateflowcard(flowCard);
//淇敼璁㈠崟琛ㄥ叆搴撶姸鎬�
@@ -132,7 +181,7 @@
finishedGoodsInventoryMapper.updateOrderWarehousingState(flowCard.getOrder().getOrderId(),2);
}
} else {
- if (finishedGoodsInventoryMapper.insertFinishedGoodsInventory(flowCard, storageRegion, remark)) {
+ if (finishedGoodsInventoryMapper.insertFinishedGoodsInventory(flowCard, storageRegion, remark,container)) {
//淇敼娴佺▼鍗¤〃鍏ュ簱鏁伴噺
finishedGoodsInventoryMapper.updateflowcard(flowCard);
//淇敼璁㈠崟鏄庣粏琛ㄥ叆搴撴暟閲�
@@ -789,6 +838,58 @@
return map;
}
+ public Map<String, Object> getSelectPrintSvs(Map<String, Object> object) {
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ List<FinishedOperateLog> finishedOperateLogList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FinishedOperateLog.class);
+ if (!finishedOperateLogList.isEmpty()) {
+ Set<String> processedProcessIds = new HashSet<>();
+ for (FinishedOperateLog finishedOperateLog : finishedOperateLogList) {
+ String OrderId = finishedOperateLog.getOrderId();
+ String Remarks = finishedOperateLog.getRemarks();
+
+ // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� OrderId锛屽鏋滃鐞嗚繃鍒欒烦杩�
+ if (processedProcessIds.contains(OrderId) && processedProcessIds.contains(Remarks)) {
+ continue;
+ }
+
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("detail", finishedOperateLogMapper.getPrimaryListLimts(finishedOperateLog.getOrderId(),finishedOperateLog.getProcessId(),finishedOperateLog.getRemarks()));
+
+ List<Map<String, Object>> detailList = finishedOperateLogMapper.getDetailList2(finishedOperateLog.getOrderId(),finishedOperateLog.getProcessId(),finishedOperateLog.getRemarks());
+
+ List<Map<String, Object>> detailsmaplist = new ArrayList<Map<String, Object>>();
+
+ for(Map<String, Object> details:detailList){
+ Map<String, Object> detailsmap = new HashMap<>();
+ detailsmap.put("product_name",details.get("product_name").toString());
+ List<Map<String, Object>> orderDetailList = finishedOperateLogMapper
+ .getDetailLists(
+ finishedOperateLog.getOrderId(),
+ finishedOperateLog.getRemarks(),
+ Integer.valueOf(details.get("product_id").toString()),
+ details.get("thickness").toString()
+ );
+ /*for (Map<String, Object>orderDetail:orderDetailList){
+
+ }*/
+
+ detailsmap.put("detailList",orderDetailList);
+ detailsmaplist.add(detailsmap);
+
+ }
+ itemmap.put("detailList", detailsmaplist);
+ list.add(itemmap);
+
+
+ processedProcessIds.add(OrderId);
+ processedProcessIds.add(Remarks);
+ }
+ }
+ map.put("data", list);
+ return map;
+ }
+
public String deliveryDetailLogic(List<OrderDetail> list,Object savePoint,String userName) {
for (OrderDetail orderDetail : list) {
--
Gitblit v1.8.0