From f1d3595e79b7a1a0ae1c862ec2c1f98da861f57e Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Mon, 28 Oct 2024 15:19:08 +0800
Subject: [PATCH] =?UTF-8?q?wms=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../WmsOdsWhiteEmbryoInController.java | 2 +
.../controller/WmsToWCSmissionController.java | 2 +-
.../wms/domain/WmsOdsMateStorageNewsSn.java | 10 ++++
.../service/IWmsOdsWhiteEmbryoInService.java | 2 +
.../impl/WmsOdsWhiteEmbryoInServiceImpl.java | 8 ++++
.../wms/WmsOdsMateStorageNewsMapper.xml | 48 +++++++------------
.../wms/WmsOdsMateStorageNewsSnMapper.xml | 7 +++
7 files changed, 46 insertions(+), 33 deletions(-)
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsWhiteEmbryoInController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsWhiteEmbryoInController.java
index 17374006..49ae6098 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsWhiteEmbryoInController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsWhiteEmbryoInController.java
@@ -3,6 +3,7 @@ package com.op.wms.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.op.wms.domain.ProOrderWorkorder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -95,4 +96,5 @@ public class WmsOdsWhiteEmbryoInController extends BaseController {
}
+
}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java
index 89d5a520..9297e2a5 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java
@@ -117,7 +117,7 @@ public class WmsToWCSmissionController {
}
/**
- * 手持 －－包材采购单采购收货确认操作--我们把入库砍掉了，你这个就是入库操作了
+ * 手持 －－包材采购单采购收货确认操作--我们把入库砍掉了，你这个就是入库操作了--不用这个了
*/
@PostMapping("/PurchaseOrderdeliPdaConfirm")
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsOdsMateStorageNewsSn.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsOdsMateStorageNewsSn.java
index afa06158..4c0d1153 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsOdsMateStorageNewsSn.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsOdsMateStorageNewsSn.java
@@ -137,6 +137,16 @@ public class WmsOdsMateStorageNewsSn extends BaseEntity {
*/
@Excel(name = "备用5")
private String userDefined5;
+ @Excel(name = "备用5")
+ private String status;
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
/**
* 备用6
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsWhiteEmbryoInService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsWhiteEmbryoInService.java
index 04706921..769e1ec4 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsWhiteEmbryoInService.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsWhiteEmbryoInService.java
@@ -2,6 +2,7 @@ package com.op.wms.service;
import java.util.List;
+import com.op.wms.domain.ProOrderWorkorder;
import com.op.wms.domain.WmsOdsWhiteEmbryoIn;
/**
@@ -59,4 +60,5 @@ public interface IWmsOdsWhiteEmbryoInService {
*/
public int deleteWmsOdsWhiteEmbryoInByID(String ID);
+
}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsWhiteEmbryoInServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsWhiteEmbryoInServiceImpl.java
index 5bb18b3d..034563f6 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsWhiteEmbryoInServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsWhiteEmbryoInServiceImpl.java
@@ -3,10 +3,13 @@ package com.op.wms.service.impl;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import com.alibaba.fastjson2.JSONArray;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.context.SecurityContextHolder;
import com.op.common.core.utils.uuid.IdUtils;
+import com.op.wms.domain.ProOrderWorkorder;
import com.op.wms.domain.Purcode;
import com.op.wms.mapper.PurcodeMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +18,10 @@ import com.op.wms.mapper.WmsOdsWhiteEmbryoInMapper;
import com.op.wms.domain.WmsOdsWhiteEmbryoIn;
import com.op.wms.service.IWmsOdsWhiteEmbryoInService;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
/**
* 白胚入库单Service业务层处理
@@ -115,6 +122,7 @@ public class WmsOdsWhiteEmbryoInServiceImpl implements IWmsOdsWhiteEmbryoInServi
return wmsOdsWhiteEmbryoInMapper.deleteWmsOdsWhiteEmbryoInByID(ID);
}
+
@DS("#header.poolName")
private String getPurcode(String factorycode, String orderType) {
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml
index f09af070..725d0ce0 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml
@@ -89,42 +89,17 @@