代码备份

src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java

@@ -57,19 +57,20 @@ public class IoCollectOrderController extends BaseController {
 
     @Resource
     private BasicCollectUserService basicCollectUserService;
+
     @GetMapping("/udiwms/basic/collect/order/filter")
     public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) {
 
         List<Long> workPlaceCodes = null;
         List<UserWorkResponse> page;
-        if (collectOrderRequest.getWorkPlaceCode() == null){
+        if (collectOrderRequest.getWorkPlaceCode() == null) {
             Long userId = getUserId();
             BasicCollectUserRequest request = new BasicCollectUserRequest();
             request.setPage(1);
             request.setLimit(100);
             request.setUserId(userId.toString());
             page = basicCollectUserService.filterList(request);
-            if (page != null){
+            if (page != null) {
                 workPlaceCodes = page.stream()
                         .map(UserWorkResponse::getWorkplaceId)
                         .collect(Collectors.toList());

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

@@ -348,6 +348,7 @@ public class IoCodeTempController extends BaseController {
         List<VailCodeResultResponse> vailCodeResultResponses = new ArrayList<>();
         for (String code : codeList) {
             VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse();
+            code = code.replace("\r\n", "");
             UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
             vailCodeResultResponse.setCode(code);
             vailCodeResultResponse.setStatus(1);

src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml

@@ -104,6 +104,8 @@
         GROUP BY
         ico.billNo
         order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc
+
+
     </select>