From 5d6572c0953ec95ddb4aca30c8003e3fd18aa20d Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 23 Apr 2024 11:34:05 +0800
Subject: [PATCH] =?UTF-8?q?wms=E6=88=90=E5=93=81=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B931?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/system/api/domain/wms/wmsReportWork.java    | 11 +++++++++++
 .../wms/service/impl/WmsProductPutServiceImpl.java | 14 ++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java
index 6db08321..95396223 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java
@@ -50,6 +50,17 @@ public class wmsReportWork extends BaseEntity {
     private String unit;
     private String   SAPstatus;
     private String SAPmessage;
+    /** 生产工单编码 */
+
+    private String SAPquantity;
+
+    public String getSAPquantity() {
+        return SAPquantity;
+    }
+
+    public void setSAPquantity(String SAPquantity) {
+        this.SAPquantity = SAPquantity;
+    }
 
     public String getSAPstatus() {
         return SAPstatus;
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
index ff445592..6e08d1d2 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
@@ -12,6 +12,7 @@ import com.op.common.core.domain.R;
 import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.uuid.IdUtils;
 import com.op.common.core.web.domain.AjaxResult;
+import com.op.common.security.utils.SecurityUtils;
 import com.op.system.api.RemoteQualityService;
 import com.op.system.api.domain.quality.QcCheckTaskWarehousingDTO;
 import com.op.system.api.domain.wms.wmsReportWork;
@@ -322,7 +323,12 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
     @DS("#header.poolName")
     public List<wmsReportWork> getReportList(wmsReportWork mesReportWork) {
         List<wmsReportWork> rlist = wmsProductPutMapper.getReportList(mesReportWork);
-        ;
+//        //加上已经过账的数量reportCode   work_order      batch_number batch
+//        for (wmsReportWork  wmsReportWork:
+//        rlist) {
+//               String   SAPquantity= wmsProductPutMapper.selectWmsProductPutNum(wmsReportWork);
+//            wmsReportWork.setSAPquantity(SAPquantity);
+//        }
         return rlist;
     }
 
@@ -407,7 +413,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
             //List<WmsProductPut> wmsProductPutList=	wmsProductPutMapper.selectWmsProductPutList(wmsProductPutk);
 
             wmsProductPutk.setAttr3(formattedDate);//
-            wmsProductPutk.setCreateBy(mesReportWork.getCreateBy());
+            wmsProductPutk.setCreateBy(SecurityUtils.getUsername());
             wmsProductPutk.setCreateTime(new Date());
 
             wmsProductPutk.setProductDate(mesReportWork.getProductDate());
@@ -423,7 +429,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
             wmsProductPutRecords.setWhCode(mesReportWork.getWhCode());//仓库编码
             wmsProductPutRecords.setId(IdUtils.fastSimpleUUID());
             wmsProductPutRecords.setNumber(mesReportWork.getQuantityQualified().toString());
-            wmsProductPutRecords.setCreateBy(mesReportWork.getCreateBy());
+            wmsProductPutRecords.setCreateBy(SecurityUtils.getUsername());
             wmsProductPutRecords.setCreateTime(new Date());
             wmsProductPutRecordsMapper.insertWmsProductPutRecords(wmsProductPutRecords);
 
@@ -441,7 +447,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
             List<WmsFpStorageNews> wmsFpStorageNewsList = wmsFpStorageNewsMapper.selectWmsFpStorageNewsList(wmsFpStorageNews);
             wmsFpStorageNews.setStorageId(IdUtils.fastSimpleUUID());
             wmsFpStorageNews.setAmount(mesReportWork.getQuantityQualified());
-            wmsFpStorageNews.setCreateBy(mesReportWork.getCreateBy());
+            wmsFpStorageNews.setCreateBy(SecurityUtils.getUsername());
             wmsFpStorageNews.setCreateTime(new Date());
             if (wmsFpStorageNewsList.size() > 0) {
                 WmsFpStorageNews wmsFpStorageNews1 = wmsFpStorageNewsList.get(0);