Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -349,7 +349,11 @@ public class IoCodeTempController extends BaseController {
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction());
         InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addOrderRequest.getInvCode());
         String code = addOrderRequest.getCode();
-        if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR);
+        if (StringUtils.isBlank(code))
+            return ResultVOUtils.error(ResultEnum.DATA_ERROR);
+        if (code.endsWith("\u001D")) {
+            code = code.replace("\u001D", "");
+        }
         UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
         if (udiEntity == null)
             return ResultVOUtils.error(500, "无效条码！");

src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java

@@ -28,6 +28,7 @@ import com.glxp.api.service.sync.SpsSyncDownloadService;
 import com.glxp.api.service.sync.SyncDataSetService;
 import com.glxp.api.task.TaskExecutorConfig;
 import com.glxp.api.util.CustomUtil;
+import com.glxp.api.util.DateUtil;
 import com.glxp.api.util.RedisUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -230,7 +231,7 @@ public class SpsSyncExportStatusController {
     @PostMapping("/spssync/basic/schedule/updateLastTime")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
     public BaseResponse updateLastTime(@RequestBody BasicExportStatusTimeEntity basicExportStatusTimeEntity) {
-
+        basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDateTime(new Date()));
         boolean b = basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity);
         if (b)
             return ResultVOUtils.success("更新成功！");

src/main/java/com/glxp/api/dao/inout/IoOrderDao.java

@@ -63,4 +63,6 @@ public interface IoOrderDao extends BaseMapperPlus<IoOrderDao, IoOrderEntity, Io
      * @return
      */
     String selectActionByBillNo(@Param("billNo") String billNo);
+
+
 }

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -231,7 +231,7 @@ public class IoOrderResponse {
 
     private Integer deliveryStatus;
     private Integer processStatus;
-    private int inCodeStatus;
+    private Integer inCodeStatus;
 
     private Integer allCout;
 

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -41,8 +41,10 @@ import com.glxp.api.service.inout.*;
 import com.glxp.api.service.inv.*;
 import com.glxp.api.service.system.SyncUploadDataBustypeService;
 import com.glxp.api.util.DateUtil;
+import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.udi.UdiCalCountUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -588,7 +590,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                         && StrUtil.isEmpty(orderEntity.getSupplementNo())
                 ) {
                     if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) {
-                        if (orderEntity.getOutChangeEnable()) {
+                        if (IntUtil.value(orderEntity.getOutChangeEnable())) {
                             response.setEnableSupplementOrder(true);
                         }
                     } else
@@ -597,6 +599,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                 result.add(response);
             } catch (Exception e) {
                 e.printStackTrace();
+                log.error(ExceptionUtils.getStackTrace(e));
                 log.error(orderEntity.getBillNo() + "平衡补单出错\n");
             }
 

src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.inv.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -142,7 +143,11 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
         response.setActionName(busType.getName());
         //设置单据日期
         IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));
-        response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+        if (order!=null){
+            response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+        }
+
+//        response.setOrderTime(DateUtil.toDateStr(new DateTime(), "yyyy-MM-dd HH:mm:ss"));
     }
 
     @Override

src/main/resources/application-dev.yml

@@ -3,9 +3,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_spms_zzzyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_zyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: Glxp@6066
+    password: 123456
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 60

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -556,4 +556,6 @@
             </otherwise>
         </choose>
     </select>
+
+
 </mapper>