From 7cea1eb71125229230ec7a4ca566656c54ebe5c3 Mon Sep 17 00:00:00 2001
From: erzhongxmu <erzhongxmu@hotmail.com>
Date: Fri, 9 Sep 2022 18:42:27 +0800
Subject: [PATCH] =?UTF-8?q?APP-=E8=87=AA=E4=B8=BB=E7=A7=BB=E5=BA=93?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zzjee/api/ApiController.java         |  6 +++---
 .../com/zzjee/wm/controller/WvStockController.java     | 10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zzjee/api/ApiController.java b/src/main/java/com/zzjee/api/ApiController.java
index 7e957f1c..13ab1ee2 100644
--- a/src/main/java/com/zzjee/api/ApiController.java
+++ b/src/main/java/com/zzjee/api/ApiController.java
@@ -306,15 +306,15 @@ public class ApiController {
         return mdGoodsController.update(mdGoodsstr, uriBuilder);
     }
 
-    //PDA自主移储保存
-
+    //PDA自主移储保存 -未更新到接口文档
     @RequestMapping(value = "/wvStockController/pdazysave", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
     @ResponseBody
     public ResponseEntity<?> update11(@RequestParam(value = "id", required = false) String id ,
                                       @RequestParam(value = "binto", required = false) String binto ,
                                       @RequestParam(value = "tinto", required = false) String tinto ,
+                                      @RequestParam(value = "goodsqua", required = false) String goodsqua ,
                                      UriComponentsBuilder uriBuilder) {
-        return wvStockController.doSttpda(id,binto,tinto, uriBuilder);
+        return wvStockController.doSttpda(id,binto,tinto, goodsqua,uriBuilder);
     }
     //商品下单
     @RequestMapping(value = "/mdGoodsController/order", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
diff --git a/src/main/java/com/zzjee/wm/controller/WvStockController.java b/src/main/java/com/zzjee/wm/controller/WvStockController.java
index 8bbdd1b8..2a5faf0b 100644
--- a/src/main/java/com/zzjee/wm/controller/WvStockController.java
+++ b/src/main/java/com/zzjee/wm/controller/WvStockController.java
@@ -568,7 +568,11 @@ public class WvStockController extends BaseController {
 
     @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
     @ResponseBody
-    public ResponseEntity<?>  doSttpda(@RequestParam String id ,@RequestParam String binto ,@RequestParam String tinto , UriComponentsBuilder uriBuilder) {
+    public ResponseEntity<?>  doSttpda(@RequestParam (value = "id", required = false) String id ,
+                                       @RequestParam(value = "binto", required = false) String binto ,
+                                       @RequestParam(value = "tinto", required = false) String tinto ,
+                                       @RequestParam(value = "goodsqua", required = false) String goodsqua,
+                                       UriComponentsBuilder uriBuilder) {
         String message = null;
         ResultDO D0 = new  ResultDO();
         message = "生成转移单成功";
@@ -603,9 +607,9 @@ public class WvStockController extends BaseController {
             wmtomove.setGoodsId(t.getGoodsId());
             wmtomove.setGoodsName(t.getShpMingCheng());
             wmtomove.setGoodsProData(t.getGoodsProData());
-            wmtomove.setGoodsQua(t.getGoodsQua().toString());
+            wmtomove.setGoodsQua(goodsqua);
             wmtomove.setGoodsUnit(t.getGoodsUnit());
-            wmtomove.setBaseGoodscount(t.getGoodsQua().toString());
+            wmtomove.setBaseGoodscount(goodsqua);
             wmtomove.setBaseUnit(t.getGoodsUnit());
             wmtomove.setMoveSta("已完成");
             wmtomove.setRunSta("计划中");