mt-ck/mt-qj-wms-hd
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

残留数据提交

Browse Source
This commit is contained in:
徐晨晨 2022-07-08 15:43:11 +08:00
parent 0b4795e92c
commit 81b9f5c45e
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfo.java
View File

@ -97,7 +97,7 @@ public class OrderInfo extends Model<OrderInfo> {
private String orderNo; private String orderNo;
/** /**
* 原订单号，APMS系统获取 返单时才存在 * 原订单号(对应原先的标识卡号)，APMS系统获取 返单时才存在
*/ */
@TableField("old_order_no") @TableField("old_order_no")
private String oldOrderNo; private String oldOrderNo;

1
6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ApmsController.java
View File

@ -47,7 +47,6 @@ public class ApmsController extends BaseController {
@Autowired @Autowired
private CommunicationLogServiceBiz communicationLogServiceBiz; private CommunicationLogServiceBiz communicationLogServiceBiz;
// static String Token = "eyJhbGciOiJIUzI1NiJ9.eyJkYXRlIjozMTkyNzU4NDk4ODA3LCJwbGF0Rm9ybUlkIjoyLCJhcGlLZXkiOiI3ZWU4ZjU5YmJhZWFlMjdlIiwiZXhwIjozMTkyNzU4NDk4LCJpYXQiOjE2Mzc1NTg0OTh9.RH3MRQr1dCBYW996-WXN69eXu1ZFblAQHfhZHNbTmCg";
static String Token = ""; static String Token = "";
static LocalDateTime TokenExpireTime = LocalDateTime.now(); static LocalDateTime TokenExpireTime = LocalDateTime.now();
static String ApiAddress = "http://59.110.171.25:9010"; static String ApiAddress = "http://59.110.171.25:9010";

2
6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java
View File

@ -216,7 +216,7 @@ public class OrderInfoServiceImpl extends BaseService implements OrderInfoServic
// 考虑返工单的加工情况，添加到返工统计信息中。 // 考虑返工单的加工情况，添加到返工统计信息中。
if (Objects.nonNull(one.getOldOrderNo())) if (Objects.nonNull(one.getOldOrderNo()))
{ {
List<OrderInfo> list = orderInfoService.list(new QueryWrapper<OrderInfo>().eq(OrderInfo.VALID, 1).eq(OrderInfo.ORDER_NO, one.getOldOrderNo())); List<OrderInfo> list = orderInfoService.list(new QueryWrapper<OrderInfo>().eq(OrderInfo.VALID, 1).eq(OrderInfo.IDEN_CARD_NUM, one.getOldOrderNo()));
float reQuantity = 0; float reQuantity = 0;
float reWeight = 0; float reWeight = 0;
for (OrderInfo orderInfo : list) for (OrderInfo orderInfo : list)