.

ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java

@@ -95,6 +95,7 @@ public class ActionCmdLogService {
                 String which = obj.getString("which");
                 record.set("content", "抬" + Enums.WhichEnum.getLabel(which) + (obj.getInteger("num") == 1 ? "前" : "后") + "闸");
                 record.set("status", obj.getBoolean("rod") ? "成功" : "失败");
+                record.set("memo", obj.get("memo"));
             } catch (Exception e) {
                 log.error(e.getMessage(), e);
             }

ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogService.java

@@ -207,6 +207,8 @@ public class ModifyLogService {
                         sqlparams.add("?");
                         params.add(obj.get("id"));
                     }
+
+                    record.set("memo", obj.get("memo"));
                 }
             } catch (Exception e) {
                 log.error(e.getMessage(), e);

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/MemoValidator.java

@@ -0,0 +1,17 @@
+package com.cowr.local.ssjygl.transport;
+
+
+import com.cowr.common.validator.CrudParamValidator;
+import com.cowr.common.view.Result;
+import com.jfinal.core.Controller;
+
+public class MemoValidator extends CrudParamValidator {
+    @Override
+    protected void validate(Controller c) {
+        validateString("memo", 1, 500, "memo", "memo 长度 1~500，必填");
+    }
+
+    protected void handleError(Controller c) {
+        c.renderJson(Result.failed(getErrmsg()));
+    }
+}

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportController.java

@@ -137,7 +137,7 @@ public class TransportController extends BaseController {
     /**
      * 手动输入重量
      */
-    @Before(ManualWeightValidator.class)
+    @Before({ManualWeightValidator.class, MemoValidator.class})
     public void manualWeight() {
         Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token"));
 
@@ -146,6 +146,7 @@ public class TransportController extends BaseController {
             return;
         }
 
+        String memo         = get("memo");
         String transport_id = get("transport_id");
         String which        = getUpperCaseVal("which", Enums.WhichEnum.R01.name());
         double weight       = getParaToDouble("weight");
@@ -156,10 +157,10 @@ public class TransportController extends BaseController {
             return;
         }
 
-        renderJson(TransportSyncService.me.manualWeight(transport_id, which, weight, tokenuser, password));
+        renderJson(TransportSyncService.me.manualWeight(transport_id, which, weight, memo, tokenuser, password));
     }
 
-    @Before({ManualCreateValidator.class})
+    @Before({ManualCreateValidator.class, MemoValidator.class})
     public void manualCreate() {
         Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token"));
 
@@ -168,6 +169,7 @@ public class TransportController extends BaseController {
             return;
         }
 
+        String memo           = get("memo");
         int    supermarket_id = getInt("supermarket_id", CliCacheData.SUP.getId());
         String truck_license  = getUpperCaseVal("truck_license");
         double first_weight   = getParaToDouble("first_weight");
@@ -180,7 +182,7 @@ public class TransportController extends BaseController {
             return;
         }
 
-        renderJson(TransportSyncService.me.manualCreate(supermarket_id, truck_license, first_weight, second_weight, out_which, tokenuser, password));
+        renderJson(TransportSyncService.me.manualCreate(supermarket_id, truck_license, first_weight, second_weight, out_which, memo, tokenuser, password));
     }
 
     /**
@@ -266,6 +268,7 @@ public class TransportController extends BaseController {
         renderJson(result ? Result.success(true) : Result.failed("重置流程失败"));
     }
 
+    @Before({MemoValidator.class})
     public void cmdRodUp() {
         Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token"));
 
@@ -274,6 +277,7 @@ public class TransportController extends BaseController {
             return;
         }
 
+        String memo  = get("memo");
         int    num   = getInt("num", 1); // 抬前闸 1，还是后闸 2 // 2020-09-28 可以确定，一个磅上只有两个闸，num 值只能为 1 或者 2
         String which = getUpperCaseVal("which");// Enums.WhichEnum R01 入场流程 C01 出场流程
 
@@ -282,7 +286,7 @@ public class TransportController extends BaseController {
             return;
         }
 
-        boolean result = TransportDeviceService.me.cmdRodUp(num == 1 ? 1 : 2, which, tokenuser);
+        boolean result = TransportDeviceService.me.cmdRodUp(num == 1 ? 1 : 2, which, memo, tokenuser);
         renderJson(result ? Result.success(true) : Result.failed("抬闸失败"));
     }
 

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportDeviceService.java

@@ -238,11 +238,12 @@ public class TransportDeviceService {
         return Config.deviceThread.cmdResetFlow(which) && ActionCmdLogSyncService.me.save(cmdlog.toJson(), sysuser);
     }
 
-    public boolean cmdRodUp(int num, String which, Sysuser sysuser) {
+    public boolean cmdRodUp(int num, String which, String memo, Sysuser sysuser) {
         Record cmdlog = new Record();
         cmdlog.set("cmd", "rodUp");
         cmdlog.set("which", which);
         cmdlog.set("num", num);
+        cmdlog.set("memo", memo);
 
         boolean ret;
 

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java

@@ -688,7 +688,7 @@ public class TransportSyncService {
      *                       2020-06-24，黄州这个参数固定为 C01
      * @return
      */
-    public Result manualCreate(int supermarket_id, String truck_license, double first_weight, double second_weight, String out_which, Sysuser sysuser, String password) {
+    public Result manualCreate(int supermarket_id, String truck_license, double first_weight, double second_weight, String out_which, String memo, Sysuser sysuser, String password) {
         try {
             // 重新验证密码
             Sysuser chkuser = SysuserSyncService.me.getUserByWhere(null, sysuser.getPhone(), password);
@@ -733,6 +733,7 @@ public class TransportSyncService {
             SyncTask synctask  = new SyncTask();
             Record   logrecord = new Record();
             logrecord.set("id", transport.getId());
+            logrecord.set("memo", memo);
             logrecord.set("modify_content", "manualWeight"); // 创建入场记录，用 Enums.DataOpType.UPDATE 记录
             logrecord.set("modify_type", "manualCreate");
             logrecord.set("first_weight", transport.getFirstWeight());
@@ -863,7 +864,7 @@ public class TransportSyncService {
      * @param password
      * @return
      */
-    public Result manualWeight(String transport_id, String which, double weight, Sysuser sysuser, String password) {
+    public Result manualWeight(String transport_id, String which, double weight, String memo, Sysuser sysuser, String password) {
         // 重新验证密码
         Sysuser chkuser = SysuserSyncService.me.getUserByWhere(null, sysuser.getPhone(), password);
 
@@ -880,6 +881,7 @@ public class TransportSyncService {
 
         Record logrecord = new Record();
         logrecord.set("id", transport_id);
+        logrecord.set("memo", memo);
         logrecord.set("modify_content", "manualWeight");
         logrecord.set("modify_type", "manualWeight_" + which);
 
@@ -915,7 +917,16 @@ public class TransportSyncService {
                     if (!ret) {
                         return false;
                     }
-                    synctask.addSaveData(ModifyLogSyncService.me.generator(Transport.tablename, "id", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser));
+
+                    ModifyLog modify = ModifyLogSyncService.me.generator(Transport.tablename, "id", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser);
+
+                    ret = modify.save();
+
+                    if (!ret) {
+                        return false;
+                    }
+
+                    synctask.addSaveData(modify);
                     synctask.addUpdateData(transport);
 
                     return SyncTaskService.me.save(synctask);