From d24de0230589862903c2155087659941e03f221b Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 30 十月 2024 10:34:04 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java     |    2 +-
 src/main/java/com/zy/asrs/controller/OpenController.java         |    5 ++++-
 src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java           |    3 ++-
 src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java |    1 -
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 908555f..b683199 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -88,6 +88,7 @@
     public synchronized R orderAccept(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = true) OrderSyncParam param,
                                      HttpServletRequest request){
+        log.info("鐢熸垚閫�璐цˉ璐у崟鎹�,{}",JSON.toJSONString(param));
         auth(appkey, param, request);
         if (Cools.isEmpty(param)) {
             return R.parse(BaseRes.PARAM);
@@ -107,6 +108,7 @@
     public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
                                         @RequestBody(required = true) OrderSyncParam param,
                                         HttpServletRequest request){
+        log.info("鐢熸垚鍏ュ簱鍗曟嵁,{}",JSON.toJSONString(param));
         auth(appkey, param, request);
         if (Cools.isEmpty(param)) {
             return R.parse(BaseRes.PARAM);
@@ -147,7 +149,7 @@
                                       //@RequestBody(required = false) HashMap<String,Object> param,
                                      @RequestBody(required = false) OrderProdSyncParam param,
                                      HttpServletRequest request){
-
+        log.info("鍚屾宸ュ崟鍗曟嵁,{}",JSON.toJSONString(param));
         auth(appkey, param, request);
         if (Cools.isEmpty(param)) {
             return R.parse(BaseRes.PARAM);
@@ -178,6 +180,7 @@
     public synchronized R orderDelete(@RequestHeader(required = false) String appkey,
                                       @RequestBody(required = false) Map<String, Object> param,
                                       HttpServletRequest request){
+        log.info("鍗曟嵁鍒犻櫎瀹℃牳,{}",JSON.toJSONString(param));
         auth(appkey, param, request);
         if (Cools.isEmpty(param)) {
             return R.parse(BaseRes.PARAM);
diff --git a/src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java
index 2b0f3f6..5851bd0 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java
@@ -16,13 +16,14 @@
             "loc_no," +
             "crn_no," +
             "barcode," +
+            "plt_type," +
             "whs_type," +
             "manu_type," +
             "appe_user," +
             "appe_time," +
             "modi_user," +
             "modi_time) " +
-            "VALUES(#{wrkSts},#{ioType},#{ioTime},#{ioPri},#{sourceLocNo},#{locNo},#{crnNo},#{barcode},#{whsType},#{manuType},#{appeUser},#{appeTime},#{modiUser},#{modiTime})")
+            "VALUES(#{wrkSts},#{ioType},#{ioTime},#{ioPri},#{sourceLocNo},#{locNo},#{crnNo},#{barcode},#{pltType},#{whsType},#{manuType},#{appeUser},#{appeTime},#{modiUser},#{modiTime})")
     public int insertByIncrease(AgvWrkMast agvWrkMast);
 
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index ddfc242..b42f5b7 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -272,7 +272,6 @@
     private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
         String response = "";
         boolean success = false;
-
         try {
             response = new HttpHandler.Builder()
                     .setUri(url)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index e274ac8..12d79cb 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -134,7 +134,7 @@
             if (pltType != null && pltType > 0) {
                 order.setPltType(pltType);
             }
-            order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMdd));
+            order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F));
             super.updateById(order);
 
         }

--
Gitblit v1.9.1