From e27a4186c67c7087435c414a4338d2df48c81d63 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 28 十二月 2023 08:24:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   37 ++++++++++++++++++++++++++++++++++---
 1 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 4bdab86..ee02c94 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,6 +1,7 @@
 package com.zy.asrs.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.R;
@@ -9,6 +10,7 @@
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.*;
 import com.zy.asrs.entity.result.InOutCountDto;
+import com.zy.asrs.entity.result.LocDetlAll;
 import com.zy.asrs.entity.result.StockVo;
 import com.zy.asrs.mapper.ReportQueryMapper;
 import com.zy.asrs.mapper.TagMapper;
@@ -129,7 +131,8 @@
         List<DetlDto> list = new ArrayList<>();
         List<DetlDto> orderDetails = param.getOrderDetails();
         for (DetlDto detail : orderDetails) {
-            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getOwnerName(),detail.getPayment());
+            dto.setBeBatch(detail.getBeBatch());
             if (DetlDto.has(list, dto)) {
                 DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
                 assert detlDto != null;
@@ -170,6 +173,7 @@
             orderDetl.setPayment(detlDto.getPayment());
             orderDetl.setStatus(1);
             orderDetl.setQty(0.0D);
+            orderDetl.setBeBatch(detlDto.getBeBatch());
             orderDetl.setWeight(detlDto.getWeight());
             if (!orderDetlService.insert(orderDetl)) {
                 throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -235,6 +239,7 @@
         List<DetlDto> orderDetails = param.getOrderDetails();
         for (DetlDto detail : orderDetails) {
             DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+            dto.setBeBatch(detail.getBeBatch());
             if (DetlDto.has(list, dto)) {
                 DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
                 assert detlDto != null;
@@ -261,6 +266,7 @@
             orderDetl.setUpdateTime(now);
             orderDetl.setStatus(1);
             orderDetl.setQty(0.0D);
+            orderDetl.setBeBatch(detlDto.getBeBatch());
             orderDetl.setWeight(detlDto.getWeight());
             if (!orderDetlService.insert(orderDetl)) {
                 throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -409,7 +415,7 @@
                 Long tagId;
                 // 涓�绾у垎绫�
                 if (!Cools.isEmpty(matParam.getGroupCode()) && !Cools.isEmpty(matParam.getGroupName())) {
-                    Tag priTag = tagService.selectByName(matParam.getGroupCode(), 2);
+                    Tag priTag = tagService.selectByName(matParam.getGroupCode(), 1);
                     if (priTag == null) {
                         Tag top = tagService.getTop();
                         NodeUtils nodeUtils = new NodeUtils();
@@ -440,7 +446,7 @@
                         }
                     }
                     // 浜岀骇鍒嗙被
-                    Tag secTag = tagService.selectByName(matParam.getGroupName(), 3);
+                    Tag secTag = tagService.selectByName(matParam.getGroupName(), 2);
                     if (secTag == null) {
                         NodeUtils nodeUtils = new NodeUtils();
                         nodeUtils.executePath(priTag.getId());
@@ -514,6 +520,8 @@
     public DigitalTwin inventoryQuantity() {
         DigitalTwin digitalTwin = new DigitalTwin();
         LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
+        LocChartPie locUseRateL = reportQueryMapper.getLocUseRateL();
+        LocChartPie locUseRateP = reportQueryMapper.getLocUseRateP();
         if(locUseRate!=null) {
             digitalTwin.setCount(locUseRate.getOqty()+locUseRate.getFqty()+locUseRate.getUqty()+locUseRate.getXqty());
             digitalTwin.setOqty(locUseRate.getOqty());
@@ -521,7 +529,30 @@
             digitalTwin.setUqty(locUseRate.getUqty());
             digitalTwin.setXqty(locUseRate.getXqty());
         }
+        if(locUseRateL!=null) {
+            digitalTwin.setCountL(locUseRateL.getOqty()+locUseRateL.getFqty()+locUseRateL.getUqty()+locUseRateL.getXqty());
+            digitalTwin.setOqtyL(locUseRateL.getOqty());
+            digitalTwin.setFqtyL(locUseRateL.getFqty());
+            digitalTwin.setUqtyL(locUseRateL.getUqty());
+            digitalTwin.setXqtyL(locUseRateL.getXqty());
+        }
+        if (locUseRateP!=null){
+            digitalTwin.setCountP(locUseRateP.getOqty()+locUseRateP.getFqty()+locUseRateP.getUqty()+locUseRateP.getXqty());
+            digitalTwin.setOqtyP(locUseRateP.getOqty());
+            digitalTwin.setFqtyP(locUseRateP.getFqty());
+            digitalTwin.setUqtyP(locUseRateP.getUqty());
+            digitalTwin.setXqtyP(locUseRateP.getXqty());
+        }
         return digitalTwin;
     }
 
+    /*
+     * 閫熻吘鏁板瓧瀛敓璋冪敤鎺ュ彛
+     * */
+    @Override
+    public synchronized R ownerAllNumber() {
+        List<LocDetlAll> locDetlAlls = locDetlService.selectOwnerAllAnfme();
+        return R.ok(locDetlAlls);
+    }
+
 }

--
Gitblit v1.9.1