Compare commits
2 Commits
7701cfdc23
...
7aa04aa2ee
| Author | SHA1 | Date |
|---|---|---|
|
|
7aa04aa2ee | |
|
|
0d2ccc6e62 |
|
|
@ -13,6 +13,8 @@ spring:
|
||||||
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
|
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
|
||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
|
username: wms
|
||||||
|
password: wms
|
||||||
config:
|
config:
|
||||||
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
||||||
namespace: wms
|
namespace: wms
|
||||||
|
|
@ -21,6 +23,8 @@ spring:
|
||||||
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
||||||
namespace: wms
|
namespace: wms
|
||||||
group: ${spring.profiles.active}
|
group: ${spring.profiles.active}
|
||||||
|
username: wms
|
||||||
|
password: wms
|
||||||
servlet:
|
servlet:
|
||||||
multipart:
|
multipart:
|
||||||
max-file-size: 200MB
|
max-file-size: 200MB
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ logging:
|
||||||
nflg: debug
|
nflg: debug
|
||||||
alibaba:
|
alibaba:
|
||||||
cloud:
|
cloud:
|
||||||
nacos: trace
|
nacos: info
|
||||||
org:
|
org:
|
||||||
springframework: info
|
springframework: info
|
||||||
# sa-token配置
|
# sa-token配置
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,8 @@ spring:
|
||||||
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
|
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
|
||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
username: wms
|
username: ${nacos.username:}
|
||||||
password: wms
|
password: ${nacos.password:}
|
||||||
config:
|
config:
|
||||||
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
||||||
namespace: wms
|
namespace: wms
|
||||||
|
|
|
||||||
|
|
@ -9,12 +9,14 @@ spring:
|
||||||
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
|
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
|
||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
username: wms
|
username: ${nacos.username:}
|
||||||
password: wms
|
password: ${nacos.password:}
|
||||||
config:
|
config:
|
||||||
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
||||||
namespace: wms
|
namespace: wms
|
||||||
group: ${spring.profiles.active}
|
group: ${spring.profiles.active}
|
||||||
|
file-extension: properties
|
||||||
|
refresh-enabled: true
|
||||||
discovery:
|
discovery:
|
||||||
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
||||||
namespace: wms
|
namespace: wms
|
||||||
|
|
|
||||||
|
|
@ -9,12 +9,14 @@ spring:
|
||||||
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
|
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
|
||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
username: wms
|
username: ${nacos.username:}
|
||||||
password: wms
|
password: ${nacos.password:}
|
||||||
config:
|
config:
|
||||||
server-addr: ${nacos.server-addr:112.74.186.154:8848}
|
server-addr: ${nacos.server-addr:112.74.186.154:8848}
|
||||||
namespace: wms
|
namespace: wms
|
||||||
group: ${spring.profiles.active}
|
group: ${spring.profiles.active}
|
||||||
|
file-extension: properties
|
||||||
|
refresh-enabled: true
|
||||||
discovery:
|
discovery:
|
||||||
server-addr: ${nacos.server-addr:112.74.186.154:8848}
|
server-addr: ${nacos.server-addr:112.74.186.154:8848}
|
||||||
namespace: wms
|
namespace: wms
|
||||||
|
|
|
||||||
|
|
@ -9,12 +9,14 @@ spring:
|
||||||
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
|
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
|
||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
username: wms
|
username: ${nacos.username:}
|
||||||
password: wms
|
password: ${nacos.password:}
|
||||||
config:
|
config:
|
||||||
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
||||||
namespace: wms
|
namespace: wms
|
||||||
group: ${spring.profiles.active}
|
group: ${spring.profiles.active}
|
||||||
|
file-extension: properties
|
||||||
|
refresh-enabled: true
|
||||||
discovery:
|
discovery:
|
||||||
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
||||||
namespace: wms
|
namespace: wms
|
||||||
|
|
|
||||||
|
|
@ -9,10 +9,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.nflg.wms.common.pojo.ApiResult;
|
import com.nflg.wms.common.pojo.ApiResult;
|
||||||
import com.nflg.wms.common.pojo.PageData;
|
import com.nflg.wms.common.pojo.PageData;
|
||||||
import com.nflg.wms.common.pojo.dto.MaterialCodePrintDTO;
|
|
||||||
import com.nflg.wms.common.pojo.dto.MaterialPdfDTO;
|
import com.nflg.wms.common.pojo.dto.MaterialPdfDTO;
|
||||||
import com.nflg.wms.common.pojo.qo.*;
|
import com.nflg.wms.common.pojo.qo.*;
|
||||||
import com.nflg.wms.common.pojo.vo.*;
|
import com.nflg.wms.common.pojo.vo.MaterialPdfVO;
|
||||||
|
import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeItemVO;
|
||||||
|
import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeQRVO;
|
||||||
import com.nflg.wms.common.util.EecExcelUtil;
|
import com.nflg.wms.common.util.EecExcelUtil;
|
||||||
import com.nflg.wms.common.util.NumberUtil;
|
import com.nflg.wms.common.util.NumberUtil;
|
||||||
import com.nflg.wms.common.util.UserUtil;
|
import com.nflg.wms.common.util.UserUtil;
|
||||||
|
|
@ -49,8 +50,8 @@ import java.io.ByteArrayOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.net.URLEncoder;
|
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
import java.net.URLEncoder;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
|
|
@ -136,7 +137,7 @@ public class MaterialCodeController extends BaseController {
|
||||||
if (CollectionUtil.isNotEmpty(idsForDelete)) {
|
if (CollectionUtil.isNotEmpty(idsForDelete)) {
|
||||||
materialCodeService.removeByIds(idsForDelete);
|
materialCodeService.removeByIds(idsForDelete);
|
||||||
materialCodeForwardService.lambdaUpdate()
|
materialCodeForwardService.lambdaUpdate()
|
||||||
.in(WmsShipmentMaterialCodeForward::getMaterialCodeId)
|
.in(WmsShipmentMaterialCodeForward::getMaterialCodeId, idsForDelete)
|
||||||
.remove();
|
.remove();
|
||||||
idsForDelete = materialCodeItemService.lambdaQuery()
|
idsForDelete = materialCodeItemService.lambdaQuery()
|
||||||
.in(WmsShipmentMaterialCodeItem::getMaterialCodeId, idsForDelete)
|
.in(WmsShipmentMaterialCodeItem::getMaterialCodeId, idsForDelete)
|
||||||
|
|
@ -399,7 +400,6 @@ public class MaterialCodeController extends BaseController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 清单明细-导入
|
* 清单明细-导入
|
||||||
*
|
|
||||||
* @param materialCodeId 清单ID
|
* @param materialCodeId 清单ID
|
||||||
* @param cover 导入模式,true:覆盖,false:新增
|
* @param cover 导入模式,true:覆盖,false:新增
|
||||||
* @param file 文件
|
* @param file 文件
|
||||||
|
|
@ -558,7 +558,6 @@ public class MaterialCodeController extends BaseController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 清单明细-根据二维码唯一号获取物料信息(PDA使用)
|
* 清单明细-根据二维码唯一号获取物料信息(PDA使用)
|
||||||
*
|
|
||||||
* @param code 二维码唯一号
|
* @param code 二维码唯一号
|
||||||
*/
|
*/
|
||||||
@GetMapping("getInfoByQRCode")
|
@GetMapping("getInfoByQRCode")
|
||||||
|
|
@ -588,7 +587,6 @@ public class MaterialCodeController extends BaseController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据清单导出标签图片ZIP(用于直连打印机打印)
|
* 根据清单导出标签图片ZIP(用于直连打印机打印)
|
||||||
*
|
|
||||||
* @param ids 清单id列表
|
* @param ids 清单id列表
|
||||||
*/
|
*/
|
||||||
@PostMapping("exportItemImageZip1")
|
@PostMapping("exportItemImageZip1")
|
||||||
|
|
@ -600,7 +598,6 @@ public class MaterialCodeController extends BaseController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据清单项导出标签图片ZIP(用于直连打印机打印)
|
* 根据清单项导出标签图片ZIP(用于直连打印机打印)
|
||||||
*
|
|
||||||
* @param ids 清单明细id列表
|
* @param ids 清单明细id列表
|
||||||
*/
|
*/
|
||||||
@PostMapping("exportItemImageZip")
|
@PostMapping("exportItemImageZip")
|
||||||
|
|
@ -643,7 +640,6 @@ public class MaterialCodeController extends BaseController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 代发物料-导入
|
* 代发物料-导入
|
||||||
*
|
|
||||||
* @param id 清单ID
|
* @param id 清单ID
|
||||||
*/
|
*/
|
||||||
@PostMapping("importForward")
|
@PostMapping("importForward")
|
||||||
|
|
@ -870,7 +866,6 @@ public class MaterialCodeController extends BaseController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 导出标签图片PDF(打印预览)
|
* 导出标签图片PDF(打印预览)
|
||||||
*
|
|
||||||
* @param response HTTP响应
|
* @param response HTTP响应
|
||||||
* @param list 物料码主表列表
|
* @param list 物料码主表列表
|
||||||
*/
|
*/
|
||||||
|
|
@ -942,7 +937,6 @@ public class MaterialCodeController extends BaseController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据明细ID导出物料明细PDF(打印预览)
|
* 根据明细ID导出物料明细PDF(打印预览)
|
||||||
*
|
|
||||||
* @param response HTTP响应
|
* @param response HTTP响应
|
||||||
* @param list 物料明细列表(包含qrCodes二维码数组)
|
* @param list 物料明细列表(包含qrCodes二维码数组)
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -13,12 +13,14 @@ spring:
|
||||||
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
|
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
|
||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
username: wms
|
username: ${nacos.username:}
|
||||||
password: wms
|
password: ${nacos.password:}
|
||||||
config:
|
config:
|
||||||
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
||||||
namespace: wms
|
namespace: wms
|
||||||
group: ${spring.profiles.active}
|
group: ${spring.profiles.active}
|
||||||
|
file-extension: properties
|
||||||
|
refresh-enabled: true
|
||||||
discovery:
|
discovery:
|
||||||
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
||||||
namespace: wms
|
namespace: wms
|
||||||
|
|
|
||||||
|
|
@ -13,12 +13,14 @@ spring:
|
||||||
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
|
import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true
|
||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
username: wms
|
username: ${nacos.username:}
|
||||||
password: wms
|
password: ${nacos.password:}
|
||||||
config:
|
config:
|
||||||
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
||||||
namespace: wms
|
namespace: wms
|
||||||
group: ${spring.profiles.active}
|
group: ${spring.profiles.active}
|
||||||
|
file-extension: properties
|
||||||
|
refresh-enabled: true
|
||||||
discovery:
|
discovery:
|
||||||
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
server-addr: ${nacos.server-addr:192.168.163.83:8848}
|
||||||
namespace: wms
|
namespace: wms
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue