问题修改

src/main/java/com/tld/controller/GsPlugOutController.java

@@ -29,8 +29,8 @@ public class GsPlugOutController {
      * @param orderNumber 参数
      */
     @GetMapping("plugOutWarehousing")
-    public void plugOutWarehousing(String orderNumber){
-        warehousingService.plugOutWarehousing(orderNumber);
+    public void plugOutWarehousing(String orderNumber , String realName){
+        warehousingService.plugOutWarehousing(orderNumber,realName);
     }
 
     /**
@@ -38,8 +38,8 @@ public class GsPlugOutController {
      * @param removalCode 要货申请单id
      */
     @GetMapping("plugOutRemoval")
-    public void plugOutRemoval(String removalCode){
-        askGoodsService.plugOutRemoval(removalCode);
+    public void plugOutRemoval(String removalCode , String realName){
+        askGoodsService.plugOutRemoval(removalCode,realName);
     }
 
     /**
@@ -47,8 +47,8 @@ public class GsPlugOutController {
      * @param removalCode 要货申请单id
      */
     @GetMapping("CreateBOLOutStock")
-    public void CreateBOLOutStock(String removalCode){
-        askGoodsService.CreateBOLOutStock(removalCode);
+    public void CreateBOLOutStock(String removalCode , String  realName){
+        askGoodsService.CreateBOLOutStock(removalCode,realName);
     }
 
     /**
@@ -56,8 +56,8 @@ public class GsPlugOutController {
      * @param removalCode 要货申请单id
      */
     @GetMapping("CreateGMReqOutStock")
-    public void CreateGMReqOutStock(String removalCode){
-        askGoodsService.CreateGMReqOutStock(removalCode);
+    public void CreateGMReqOutStock(String removalCode , String realName ){
+        askGoodsService.CreateGMReqOutStock(removalCode,realName);
     }
 
     /**
@@ -65,8 +65,8 @@ public class GsPlugOutController {
      * @param removalCode 入库单编号
      */
     @GetMapping("CreateGRReqInStock")
-    public void CreateGRReqInStock(String removalCode){
-        askGoodsService.CreateGRReqInStock(removalCode);
+    public void CreateGRReqInStock(String removalCode , String realName){
+        askGoodsService.CreateGRReqInStock(removalCode,realName);
     }
 
     /**
@@ -74,8 +74,8 @@ public class GsPlugOutController {
      * @param removalCode 入库单编号
      */
     @GetMapping("CreateOtherInStock")
-    public void CreateOtherInStock(String removalCode){
-        askGoodsService.CreateOtherInStock(removalCode);
+    public void CreateOtherInStock(String removalCode , String realName){
+        askGoodsService.CreateOtherInStock(removalCode,realName);
     }
 
     /**
@@ -83,8 +83,8 @@ public class GsPlugOutController {
      * @param removalCode 入库单编号
      */
     @GetMapping("CreateOtherDeliveryMaterials")
-    public void CreateOtherDeliveryMaterials(String removalCode){
-        askGoodsService.CreateOtherDeliveryMaterials(removalCode);
+    public void CreateOtherDeliveryMaterials(String removalCode , String realName){
+        askGoodsService.CreateOtherDeliveryMaterials(removalCode,realName);
     }
 
     /**
@@ -92,8 +92,8 @@ public class GsPlugOutController {
      * @param removalCode 入库单编号
      */
     @GetMapping("CreateOtherDeliveryMaterial")
-    public void CreateOtherDeliveryMaterial(String removalCode){
-        askGoodsService.CreateOtherDeliveryMaterial(removalCode);
+    public void CreateOtherDeliveryMaterial(String removalCode , String realName){
+        askGoodsService.CreateOtherDeliveryMaterial(removalCode,realName);
     }
 
     /**

src/main/java/com/tld/service/AskGoodsService.java

@@ -20,7 +20,7 @@ public interface AskGoodsService {
 
     Map<String, Object> OutOfLibrary(String uniqueCode, String type, String askGoodsId);
 
-    void plugOutRemoval(String removalCode);
+    void plugOutRemoval(String removalCode , String realName);
 
     Map<String, Object> getRemoval(AskGoods askGoods);
 
@@ -44,17 +44,17 @@ public interface AskGoodsService {
 
     Map<String, Object> delAskGoods(String id, HttpServletRequest request);
 
-    void CreateBOLOutStock(String removalCode);
+    void CreateBOLOutStock(String removalCode, String realName);
 
     Map<String, Object> addWarehouseTransferVitrual(AskGoods askGoods);
 
-    void CreateGMReqOutStock(String removalCode);
+    void CreateGMReqOutStock(String removalCode, String realName);
 
-    void CreateGRReqInStock(String removalCode);
+    void CreateGRReqInStock(String removalCode, String realName);
 
-    void CreateOtherInStock(String removalCode);
+    void CreateOtherInStock(String removalCode, String realName);
 
-    void CreateOtherDeliveryMaterials(String removalCode);
+    void CreateOtherDeliveryMaterials(String removalCode, String realName);
 
-    void CreateOtherDeliveryMaterial(String removalCode);
+    void CreateOtherDeliveryMaterial(String removalCode, String realName);
 }

src/main/java/com/tld/service/WarehousingService.java

@@ -15,7 +15,7 @@ public interface WarehousingService {
 
     Map<String, Object> warehousing(String uniqueCode, String type, String warehouseTransferId);
 
-    void plugOutWarehousing(String orderNumber);
+    void plugOutWarehousing(String orderNumber , String realName);
 
     Map<String, Object> warehousingFlowing(Storage storage);
 

src/main/java/com/tld/service/impl/AskGoodsServiceImpl.java

@@ -299,7 +299,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void plugOutRemoval(String removalCode) {
+    public void plugOutRemoval(String removalCode, String realName) {
         try{
             JSONObject returnData = new JSONObject();
             List<JSONObject> retunList = new LinkedList<>();
@@ -316,7 +316,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     strJson.put("SourceType", mapList.get(0).get("sourceType").toString());//来源类型
                     strJson.put("MoveType", mapList.get(0).get("moveType").toString());//移动类型
                     strJson.put("IsRed", 0);//是否红单1
-                    strJson.put("Creator", "测试");//制单人姓名1
+                    strJson.put("Creator", realName);//制单人姓名1
                     //子表
                     List<JSONObject> list = new LinkedList<>();
                     for (Map<String, Object> map : askGoodsMapper.getRemovalz(mapList.get(0).get("askGoodsId").toString(), warehouseWhere)) {
@@ -735,7 +735,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
      * @return
      */
     @Override
-    public void CreateBOLOutStock(String removalCode) {
+    public void CreateBOLOutStock(String removalCode, String realName) {
         try{
             String documentId = null ;
             JSONObject returnData = new JSONObject();
@@ -754,7 +754,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     strJson.put("SourceType", mapList.get(0).get("sourceType").toString());//来源类型
                     strJson.put("MoveType", mapList.get(0).get("moveType").toString());//移动类型
                     strJson.put("IsRed", 0);//是否红单1
-                    strJson.put("Creator", "测试");//制单人姓名1
+                    strJson.put("Creator", realName);//制单人姓名1
                     //子表
                     List<JSONObject> list = new LinkedList<>();
                     for (Map<String, Object> map : askGoodsMapper.getRemovalz(mapList.get(0).get("askGoodsId").toString(), warehouseWhere)) {
@@ -882,7 +882,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
      * 移库单接口文档
      */
     @Override
-    public void CreateGMReqOutStock(String removalCode) {
+    public void CreateGMReqOutStock(String removalCode, String realName) {
         try {
             JSONObject returnData = new JSONObject();
             List<JSONObject> retunList = new LinkedList<>();
@@ -903,7 +903,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     strJson.put("SourceBillDate", DateUtil.dateConversion(mapList.get(0).get("scrq").toString()));//业务日期
                     strJson.put("MoveType", mapList.get(0).get("warehouseTransferType").toString());//移动类型
                     strJson.put("IsRed", 0);//是否红单1
-                    strJson.put("Creator", "测试");//制单人姓名1
+                    strJson.put("Creator", realName);//制单人姓名1
                     //子表
                     List<JSONObject> list = new LinkedList<>();
                     for (Map<String, Object> map : askGoodsMapper.getReturnWarehouseTransferZ(mapList.get(0).get("warehouseTransferId").toString(), warehouseWhere)) {
@@ -985,7 +985,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
     * @Date: 2023/4/7
     */
     @Override
-    public void CreateGRReqInStock(String removalCode) {
+    public void CreateGRReqInStock(String removalCode, String realName) {
         try {
             JSONObject returnData = new JSONObject();
             List<JSONObject> retunList = new LinkedList<>();
@@ -1008,7 +1008,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     strJson.put("SourceType", mapList.get(0).get("sourceType").toString());//来源类型
                     strJson.put("MoveType", mapList.get(0).get("moveType").toString());//移动类型
                     strJson.put("IsRed", 0);//是否红单1
-                    strJson.put("Creator", "测试");//制单人姓名1
+                    strJson.put("Creator", realName);//制单人姓名1
                     //子表
                     List<JSONObject> list = new LinkedList<>();
                     for (Map<String, Object> map : askGoodsMapper.getNoticeSubtabulation(mapList.get(0).get("noticeId").toString())) {
@@ -1101,7 +1101,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
     * @Date: 2023/4/12
     */
     @Override
-    public void CreateOtherInStock(String removalCode) {
+    public void CreateOtherInStock(String removalCode, String realName) {
         try {
             JSONObject returnData = new JSONObject();
             List<JSONObject> retunList = new LinkedList<>();
@@ -1120,7 +1120,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     strJson.put("SourceType", returnWarehousing1.get("sourceType").toString());//来源类型
                     strJson.put("MoveType", returnWarehousing1.get("moveType").toString());//移动类型
                     strJson.put("IsRed", 0);//是否红单1
-                    strJson.put("Creator", "测试");//制单人姓名1
+                    strJson.put("Creator", realName);//制单人姓名1
                     //查询信息
                     List<JSONObject> list = new LinkedList<>();
                     List<Map<String, Object>> mapList = askGoodsMapper.getNoticesParent(removalCode,returnWarehousing1.get("storageLocationCode").toString());
@@ -1203,7 +1203,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
     * @Date: 2023/4/13
     */
     @Override
-    public void CreateOtherDeliveryMaterials(String removalCode) {
+    public void CreateOtherDeliveryMaterials(String removalCode, String realName) {
         try {
             String documentId = null ;
             JSONObject returnData = new JSONObject();
@@ -1227,7 +1227,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     strJson.put("SourceType", mapList.get(0).get("sourceType").toString());//来源类型
                     strJson.put("MoveType", mapList.get(0).get("moveType").toString());//移动类型
                     strJson.put("IsRed", 0);//是否红单1
-                    strJson.put("Creator", "测试");//制单人姓名1
+                    strJson.put("Creator", realName);//制单人姓名1
                     //子表
                     List<JSONObject> list = new LinkedList<>();
                     for (Map<String, Object> map : askGoodsMapper.getRemovalz(mapList.get(0).get("askGoodsId").toString(),maps.get("warehouseWhere").toString())) {
@@ -1308,7 +1308,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
     * @Date: 2023/4/14
     */
     @Override
-    public void CreateOtherDeliveryMaterial(String removalCode) {
+    public void CreateOtherDeliveryMaterial(String removalCode, String realName) {
         try {
             String documentId = null ;
             JSONObject returnData = new JSONObject();
@@ -1332,7 +1332,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     strJson.put("SourceType", mapList.get(0).get("sourceType").toString());//来源类型
                     strJson.put("MoveType", mapList.get(0).get("moveType").toString());//移动类型
                     strJson.put("IsRed", 0);//是否红单1
-                    strJson.put("Creator", "测试");//制单人姓名1
+                    strJson.put("Creator", realName);//制单人姓名1
                     //子表
                     List<JSONObject> list = new LinkedList<>();
                     for (Map<String, Object> map : askGoodsMapper.getRemovalz(mapList.get(0).get("askGoodsId").toString(),maps.get("warehouseWhere").toString())) {

src/main/java/com/tld/service/impl/WarehousingServiceImpl.java

@@ -226,7 +226,7 @@ public class WarehousingServiceImpl implements WarehousingService {
     }
 
     @Override
-    public void plugOutWarehousing(String orderNumber) {
+    public void plugOutWarehousing(String orderNumber, String realName) {
         try {
             for (ReturnWarehousing returnWarehousing : warehousingMapper.getPlugOutWarehousing(orderNumber)) {
                 JSONObject returnData = new JSONObject();
@@ -241,7 +241,7 @@ public class WarehousingServiceImpl implements WarehousingService {
                 strJson.put("MoveType", returnWarehousing.getMoveType());//移动类型
                 strJson.put("IsRed", "0");//是否红单1
 //                strJson.put("Creator", returnWarehousing.getUserName());//制单人姓名
-                strJson.put("Creator", "测试");//制单人姓名
+                strJson.put("Creator", realName);//制单人姓名
                 BillItems.put("WMSItemID", returnWarehousing.getReceiveGoodsId());//利道WMS入库单分录ID
                 BillItems.put("PurOrderID", returnWarehousing.getOrderNumber());//采购单id
                 BillItems.put("PurOrderItemID", returnWarehousing.getEntryNumber());//采购订单明细ID