1

app-log/log_error.log

@@ -961,3 +961,7 @@ Caused by: java.sql.SQLSyntaxErrorException: You have an error in your SQL synta
 
 2024-03-14 03:25:09.563 ERROR 15708 --- [main] easy-es                                  : Easy-Es supported elasticsearch and restHighLevelClient jar version is:7.14.0 ,Please resolve the dependency conflict!
 2024-03-14 03:29:19.190 ERROR 15708 --- [http-nio-10030-exec-1] c.j.j.b.c.handle.GlobalExceptionHandler  : >授权异常>>获取token失败，请检查header和param中是否传递了用户token
+2024-03-14 04:53:03.490 ERROR 15708 --- [http-nio-10030-exec-3] c.j.j.b.c.handle.GlobalExceptionHandler  : 业务异常，错误信息为：单据不存在
+2024-03-14 05:18:09.192 ERROR 18736 --- [main] easy-es                                  : Easy-Es supported elasticsearch and restHighLevelClient jar version is:7.14.0 ,Please resolve the dependency conflict!
+2024-03-14 08:34:14.539 ERROR 18736 --- [http-nio-10030-exec-8] c.j.j.b.c.handle.GlobalExceptionHandler  : >授权异常>>获取token失败，请检查header和param中是否传递了用户token
+2024-03-14 08:38:12.978 ERROR 18736 --- [http-nio-10030-exec-7] c.j.j.b.c.handle.GlobalExceptionHandler  : >授权异常>>获取token失败，请检查header和param中是否传递了用户token

jyzb-biz/src/main/java/com/junmp/jyzb/cache/TemperatureRedisCache.java

@@ -33,8 +33,9 @@ public class TemperatureRedisCache extends AbstractRedisCache<Object> {
         data.setWarehouseName(warehouseName);
 //        String key = warehouseId;
 //        Long size = getRedisTemplate().opsForZSet().size(key);
+        getRedisTemplate().expire("WarehouseDev:"+warehouseId, 259200, TimeUnit.SECONDS);
         getRedisTemplate().opsForZSet().add("WarehouseDev:"+warehouseId, data, timestamp);
-        getRedisTemplate().opsForValue().getOperations().expire("WarehouseDev:" + warehouseId, 259200, TimeUnit.SECONDS);
+         // Setting expire directly on the key
         put(warehouseId, data);
     }
     public List<Object> getDataByTimestampRange(String warehouseId, long startTimestamp, long endTimestamp) {

jyzb-biz/src/main/java/com/junmp/jyzb/controller/OrderController.java

@@ -90,7 +90,7 @@ public class OrderController {
     }
 
     //记账完成之后往消息队列推送消息表示该单子已经完成结算
-    @PostMapping(path="/Accounting",name="记账#logType=30")
+    @PostMapping(path="/",name="记账#logType=30")
     @ApiOperation("记账")
     public ApiRes<Boolean> Accounting(@RequestBody @Validated(ValidationApi.delete.class) UpdateOrderReq req){
         return ApiRes.success(orderMainService.Accounting(req));

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/LogSummaryServiceImpl.java

@@ -769,7 +769,7 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
         Map<String,LogSummaryReq> logMap=new HashMap<>();
         for (InventoryReq inv:list) {
 
-            logMap=setLogSummaryToMap(logMap,loginUser,inv.getLocationId(),inv.getBussinessType(),inv.getTypeName(),
+            logMap=setLogSummaryToMap(logMap,loginUser,inv.getLocationId(),bussinessType,inv.getTypeName(),
                     inv.getLocationName(),orderId,orderCode,inv.getOrgId(),inv.getLocationState(),deviceType);
         }
         logMap = setLogDetailToMap(list, logMap, bussinessType);

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -1039,6 +1039,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                             if (orderMain.getOrderType().equals("in")){ //入库
                                 Random random = new Random();
                                 for (int i=0;i<subNum;i++) {
+
                                     String epc="000000"+DateTimeUtil.getCurrentDateTime().getTime()+(random.nextInt(999999 - 100000 + 1) + 100000);
                                     Inventory inventory = new Inventory();
                                     InventoryReq inventoryReq = new InventoryReq();
@@ -1064,6 +1065,10 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                                     inventory.setLocationName(detailJsonReq.getLocationName());
                                     inventory.setBussinessType(req.getBussinessType());
                                     inventory.setLocationState("in");
+                                    inventory.setSupplierId(orderMain.getBussinessType().equals("purchase")?
+                                            orderMain.getSupplierId():null);
+                                    inventory.setSupplierName(orderMain.getBussinessType().equals("purchase")?
+                                            orderMain.getSupplierName():null);
                                     addInvList.add(inventory);
                                     BeanPlusUtil.copyProperties(inventory,inventoryReq);
                                     addReqInvList.add(inventoryReq);