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

src/main/java/com/glxp/api/controller/basic/UdiSyncController.java

@@ -56,7 +56,6 @@ public class UdiSyncController {
     BasicProductsDao basicProductsDao;
 
 
-
     //获取同步库UDI信息
     @AuthRuleAnnotation("")
     @GetMapping("udiwms/udiinfo/filterUdi")
@@ -221,23 +220,22 @@ public class UdiSyncController {
     }
 
 
-
     @GetMapping("udiwms/test")
     public void filterUdi() {
-        FilterUdiRelRequest filterUdiRelRequest=new FilterUdiRelRequest();
+        FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
         List<BasicProductsEntity> data = basicProductsDao.selectList();
-        int i=0;
+        int i = 0;
         try {
             for (BasicProductsEntity datum : data) {
-                if(StrUtil.isNotEmpty(datum.getCpmctymc()) && StrUtil.isEmpty(datum.getPinyinInitial()) && !datum.getCpmctymc().substring(0,1).equals("α")){
+                if (StrUtil.isNotEmpty(datum.getCpmctymc()) && StrUtil.isEmpty(datum.getPinyinInitial()) && !datum.getCpmctymc().substring(0, 1).equals("α")) {
                     i++;
-                    String a=datum.getCpmctymc().substring(0,1);
+                    String a = datum.getCpmctymc().substring(0, 1);
                     datum.setPinyinInitial(converterToFirstSpell(datum.getCpmctymc()));
-                    System.out.println("-----------------------------------------------------"+i);
+                    System.out.println("-----------------------------------------------------" + i);
                 }
             }
-        }catch (Exception e){
+        } catch (Exception e) {
-            System.out.println("|||||||||||||||||||||||"+e.getMessage());
+            System.out.println("|||||||||||||||||||||||" + e.getMessage());
         }
         basicProductsDao.updateBatchById(data);
     }
@@ -266,6 +264,7 @@ public class UdiSyncController {
 
     /**
      * 清理特殊字符以便得到
+     *
      * @param chines
      * @return
      */
@@ -280,6 +279,5 @@ public class UdiSyncController {
     }
 
 
-
 }
 

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

@@ -39,6 +39,7 @@ import com.glxp.api.service.system.SystemParamConfigService;
 import com.glxp.api.util.*;
 import com.glxp.api.util.udi.UdiCalCountUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -112,7 +113,6 @@ public class IoOrderReviewController extends BaseController {
 
     }
 
-
     //前端二次审核
     @AuthRuleAnnotation("")
     @PostMapping("/spms/inout/order/web/updateStatus")
@@ -151,6 +151,7 @@ public class IoOrderReviewController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("/spms/inout/order/third/updateStatus")
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
+    @Transactional(rollbackFor = Exception.class)
     public BaseResponse thirdUpdateStatus(@RequestBody ReviewFinishRequest updateExportStatusRequest,
                                           BindingResult bindingResult) {
 
@@ -158,6 +159,12 @@ public class IoOrderReviewController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         IoOrderEntity orderEntity = orderService.findByBillNo(updateExportStatusRequest.getOrderId());
+        if (updateExportStatusRequest.isEntrust()) {
+            EntrustReceEntity entrustReceEntity = entrustReceService.findByUnique(orderEntity.getAction(), getUserId());
+            if (entrustReceEntity != null && StrUtil.isNotEmpty(entrustReceEntity.getEntrustAction())) {
+                transferOrder(orderEntity, entrustReceEntity);
+            }
+        }
         if (orderEntity == null) {
             return ResultVOUtils.error(500, "未找到该业务单据");
         }
@@ -317,7 +324,7 @@ public class IoOrderReviewController extends BaseController {
                     supplementCode.setDeptCode(supplementOrder.getDeptCode());
                     supplementCode.setOrderId(supplementOrderNo);
                     //查询补单设置
-                    supplementCode.setAction(bussinessTypeEntity.getSupplementOrderType());
+                    supplementCode.setAction(bussinessTypeEntity.getAction());
                     supplementCode.setMainAction(bussinessTypeEntity.getMainAction());
                     supplementCode.setId(null);
                     supplementCodes.add(supplementCode);
@@ -444,6 +451,8 @@ public class IoOrderReviewController extends BaseController {
         redisUtil.del(ConstantStatus.REDIS_BILLNO_CODES + orderEntity.getBillNo());
         //验收完成->进入流程
         ioCheckInoutService.checkThird(orderEntity);
+
+
         return ResultVOUtils.success("更新成功");
     }
 
@@ -469,12 +478,12 @@ public class IoOrderReviewController extends BaseController {
         EntrustReceEntity entrustReceEntity;
         if (StrUtil.isNotEmpty(errMsg)) {
             if (errMsg.equals("委托验收")) {
-//                IoOrderEntity orderEntity = orderService.findByBillNo(billNo);
+                IoOrderEntity orderEntity = orderService.findByBillNo(billNo);
-//                entrustReceEntity = entrustReceService.findByUnique(orderEntity.getAction(), userId);
+                entrustReceEntity = entrustReceService.findByUnique(orderEntity.getAction(), userId);
-//                if (entrustReceEntity != null) {
+                if (entrustReceEntity != null) {
-//                    acceptOrderEntity.setEntrust(true);
+                    acceptOrderEntity.setEntrust(true);
-//                } else
+                }
-//                    return ResultVOUtils.error(500, "无权限验收！");
+//              else      return ResultVOUtils.error(500, "无权限验收！");
             } else
                 return ResultVOUtils.error(500, errMsg);
         }

src/main/resources/application-dev.yml

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

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: test
+    active: dev
   jmx:
     enabled: false
   servlet: