#

whycq

2023-10-11 1ff7953396ba7bf152186d7bac830c12da5b9067

#

 src/main/java/com/zy/asrs/controller/OrderController.java

@@ -348,7 +348,6 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<OrderLog> wrapper = new EntityWrapper<>();
        wrapper.orderBy("create_time");
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){

 src/main/java/com/zy/asrs/controller/WrkMastController.java

@@ -1,6 +1,5 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -15,7 +14,6 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.dto.WrkDetlWithCheck;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -65,7 +63,6 @@
        }else {
            wrapper.orderBy("io_time", false);
        }
        wrkMastService.selectPage(new Page<>(curr, limit), wrapper);
        return R.ok(wrkMastService.selectPage(new Page<>(curr, limit), wrapper));
    }


 src/main/java/com/zy/common/web/WcsController.java

@@ -159,7 +159,7 @@
        }
        // 生成工作档明细
        waitPakins.forEach(waitPakin -> {
            waitPakin.setBatch("");
//            waitPakin.setBatch("");
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(waitPakin);
            wrkDetl.setWrkNo(wrkMast.getWrkNo());

 src/main/resources/application.yml

@@ -13,7 +13,7 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=bfasrs
#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
    username: sa
#    password: Zoneyung@zy56$