修改业务单bug
This commit is contained in:
+7
@@ -550,6 +550,13 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
|
||||
//相加
|
||||
tmsOrderAddDTO.setGoodsName("数量"+String.valueOf(bag + box));
|
||||
}
|
||||
tmsOrderAddDTO.setGoodsNumber(businessDocumentOrder.getGoodsNumber());
|
||||
String mainOrderNum = businessDocumentOrder.getMainOrderNum();
|
||||
if (mainOrderNum != null) {
|
||||
tmsOrderAddDTO.setBusinessMainOrder(mainOrderNum);
|
||||
}else {
|
||||
tmsOrderAddDTO.setBusinessMainOrder(businessDocumentOrder.getGoodsNumber());
|
||||
}
|
||||
|
||||
//货物信息
|
||||
List<BusinessDocumentCargoMulti> businessDocumentCargoMultiList=businessDocumentCargoMultiMapper.selectList(new QueryWrapper<BusinessDocumentCargoMulti>().lambda()
|
||||
|
||||
+7
@@ -211,6 +211,13 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
|
||||
tmsOrderAddDTO.setOrderSource("0");
|
||||
tmsOrderAddDTO.setOrganizationId(organizationId);
|
||||
tmsOrderAddDTO.setLoginUser(loginUser);
|
||||
tmsOrderAddDTO.setGoodsNumber(businessDocumentOrder.getGoodsNumber());
|
||||
String mainOrderNum = businessDocumentOrder.getMainOrderNum();
|
||||
if (mainOrderNum != null) {
|
||||
tmsOrderAddDTO.setBusinessMainOrder(mainOrderNum);
|
||||
}else {
|
||||
tmsOrderAddDTO.setBusinessMainOrder(businessDocumentOrder.getGoodsNumber());
|
||||
}
|
||||
BusinessDeliveryDetailsLink businessDeliveryDetailsLink = businessDeliveryDetailsLinkMapper.selectOne(new LambdaQueryWrapper<BusinessDeliveryDetailsLink>().eq(BusinessDeliveryDetailsLink::getSubOrderId, businessDocumentOrder.getId()));
|
||||
if (ObjectUtil.isNotNull(businessDeliveryDetailsLink)) {
|
||||
Integer bag = businessDeliveryDetailsLink.getBag();
|
||||
|
||||
+1
@@ -221,4 +221,5 @@ public class ExecuteOrderPO extends BaseVOEntity{
|
||||
@ApiModelProperty("卸货联系人")
|
||||
@Excel(name = "卸货联系人")
|
||||
private String dischargerName;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user