From 434f3f3189be75a0688bf65923808c35797a2175 Mon Sep 17 00:00:00 2001
From: erzhongxmu <erzhongxmu@hotmail.com>
Date: Fri, 9 Sep 2022 18:22:38 +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

---
 .../java/com/zzjee/api/ApiController.java     |  8 +--
 .../wm/controller/WvStockController.java      | 60 +++++++++++++++++++
 2 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zzjee/api/ApiController.java b/src/main/java/com/zzjee/api/ApiController.java
index 250d9ccc..b4620f09 100644
--- a/src/main/java/com/zzjee/api/ApiController.java
+++ b/src/main/java/com/zzjee/api/ApiController.java
@@ -241,7 +241,7 @@ public class ApiController {
     public ResponseEntity<?> list7(@RequestParam(value = "username", required = false) String username,
                                    @RequestParam(value = "searchstr", required = false) String searchstr,
                                    @RequestParam(value = "searchstr2", required = false) String searchstr2,
-                                   @RequestParam(value = "searchstr2", required = false) String searchstr3) {
+                                   @RequestParam(value = "searchstr3", required = false) String searchstr3) {
         return wvStockController.list(username, searchstr, searchstr2,searchstr3);
     }
 
@@ -306,13 +306,13 @@ public class ApiController {
         return mdGoodsController.update(mdGoodsstr, uriBuilder);
     }
 
-    //PDA移储保存
+    //PDA自主移储保存
 
     @RequestMapping(value = "/wmToMoveGoodsController/save", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
     @ResponseBody
-    public ResponseEntity<?> update11(@RequestParam String wmToMoveGoodsstr,
+    public ResponseEntity<?> update11(@RequestParam String id ,@RequestParam String binto ,@RequestParam String tinto ,
                                      UriComponentsBuilder uriBuilder) {
-        return wmToMoveGoodsController.update(wmToMoveGoodsstr, uriBuilder);
+        return wvStockController.doSttpda(id,binto,tinto, 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 913d0f2c..8bbdd1b8 100644
--- a/src/main/java/com/zzjee/wm/controller/WvStockController.java
+++ b/src/main/java/com/zzjee/wm/controller/WvStockController.java
@@ -566,6 +566,66 @@ public class WvStockController extends BaseController {
         return j;
     }
 
+    @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public ResponseEntity<?>  doSttpda(@RequestParam String id ,@RequestParam String binto ,@RequestParam String tinto , UriComponentsBuilder uriBuilder) {
+        String message = null;
+        ResultDO D0 = new  ResultDO();
+        message = "生成转移单成功";
+        WvStockEntity t = wvStockService.get(WvStockEntity.class, id);
+        try {
+            WmToMoveGoodsEntity wmtomove = new WmToMoveGoodsEntity();
+            wmtomove.setOrderTypeCode("TPZY");
+            wmtomove.setBinFrom(t.getKuWeiBianMa());
+            wmtomove.setBinTo(t.getKuWeiBianMa());
+            if(StringUtil.isNotEmpty(binto)){
+                wmtomove.setBinTo(binto);
+            }
+            wmtomove.setTinFrom(t.getBinId());
+            wmtomove.setTinId(t.getBinId());
+            if(StringUtil.isNotEmpty(tinto)){
+                wmtomove.setTinId(tinto);
+            }
+            wmtomove.setCusCode(t.getCusCode());
+            wmtomove.setCusName(t.getZhongWenQch());
+            wmtomove.setToCusCode(t.getCusCode());
+            wmtomove.setToCusName(t.getZhongWenQch());
+
+            try {
+                MdCusEntity mdcus = systemService.findUniqueByProperty(MdCusEntity.class, "keHuBianMa", t.getCusCode());
+                wmtomove.setCusName(mdcus.getZhongWenQch());
+                wmtomove.setToCusName(mdcus.getZhongWenQch());
+
+            } catch (Exception e) {
+
+            }
+
+            wmtomove.setGoodsId(t.getGoodsId());
+            wmtomove.setGoodsName(t.getShpMingCheng());
+            wmtomove.setGoodsProData(t.getGoodsProData());
+            wmtomove.setGoodsQua(t.getGoodsQua().toString());
+            wmtomove.setGoodsUnit(t.getGoodsUnit());
+            wmtomove.setBaseGoodscount(t.getGoodsQua().toString());
+            wmtomove.setBaseUnit(t.getGoodsUnit());
+            wmtomove.setMoveSta("已完成");
+            wmtomove.setRunSta("计划中");
+
+            systemService.save(wmtomove);
+            systemService.addLog(message, Globals.Log_Type_UPDATE,
+                    Globals.Log_Leavel_INFO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            message = "生成转移单失败";
+            D0.setOK(false);
+            D0.setErrorMsg(message);
+            return new ResponseEntity(D0, HttpStatus.OK);
+        }
+        D0.setOK(true);
+        D0.setErrorMsg(message);
+
+        return new ResponseEntity(D0, HttpStatus.OK);
+    }
+
     @RequestMapping(params = "dostttpzy")
     @ResponseBody
     public AjaxJson doStttpzy(WvStockEntity wvStock, HttpServletRequest request) {