weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

维他奶w库存;

Browse Source
This commit is contained in:
王奎兴
2026-05-27 19:50:33 +08:00
parent 7a2174d626
commit e2d312a79c
8 changed files with 137 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
+34 -6
View File
@@ -710,15 +710,43 @@ public class ReservationStockOutOrderDomainService {
reservationStockInOrder.setOrderStatus("新增");
reservationStockInOrder.setSalesmanId(loginUser.getUserPo().getUserId().toString());
reservationStockInOrder.setSalesmanName(loginUser.getUserPo().getUserName());
reservationStockInOrder.setInOrderNumber("退"+stockOutOrder.getOutOrderNumber());
Random random = new Random();
int num = random.nextInt(1000); // 0~999
String str = String.format("%03d", num); // 不足三位前面补零
reservationStockInOrder.setInOrderNumber("退"+stockOutOrder.getOutOrderNumber()+str);
reservationStockInOrderMapper.insert(reservationStockInOrder);
reservationDeliveryDetailsLink.setReturnOrderNumber(reservationStockInOrder.getInOrderNumber());
reservationDeliveryDetailsLinkService.updateById(reservationDeliveryDetailsLink);
stockOutOrder.setReturnOrderNumber(reservationStockInOrder.getInOrderNumber());
stockOutOrder.setDeliveryName(reservationDeliveryDetailsLink.getDeliveryName());
stockOutOrder.setInvoiceNumber(reservationDeliveryDetailsLink.getInvoiceNumber());
stockOutOrder.setCustomerNumber(reservationDeliveryDetailsLink.getCustomerNumber());
stockOutOrder.setReturnQuantity(new BigDecimal(bag));
String returnOrderNumber = stockOutOrder.getReturnOrderNumber();
if (returnOrderNumber == null) {
stockOutOrder.setReturnOrderNumber(reservationStockInOrder.getInOrderNumber());
} else {
stockOutOrder.setReturnOrderNumber(returnOrderNumber + "," + reservationStockInOrder.getInOrderNumber());
}
String deliveryName = stockOutOrder.getDeliveryName();
if (deliveryName == null) {
stockOutOrder.setDeliveryName(reservationDeliveryDetailsLink.getDeliveryName());
} else {
stockOutOrder.setDeliveryName(deliveryName + "," + reservationDeliveryDetailsLink.getDeliveryName());
}
String invoiceNumber1 = stockOutOrder.getInvoiceNumber();
if (invoiceNumber1 == null) {
stockOutOrder.setInvoiceNumber(reservationDeliveryDetailsLink.getInvoiceNumber());
} else {
stockOutOrder.setInvoiceNumber(invoiceNumber1 + "," + reservationDeliveryDetailsLink.getInvoiceNumber());
}
String customerNumber = stockOutOrder.getCustomerNumber();
if (customerNumber == null) {
stockOutOrder.setCustomerNumber(reservationDeliveryDetailsLink.getCustomerNumber());
} else {
stockOutOrder.setCustomerNumber(customerNumber + "," + reservationDeliveryDetailsLink.getCustomerNumber());
}
BigDecimal returnQuantity = stockOutOrder.getReturnQuantity();
if (returnQuantity == null || returnQuantity.compareTo(BigDecimal.ZERO) == 0) {
stockOutOrder.setReturnQuantity(new BigDecimal(bag));
} else {
stockOutOrder.setReturnQuantity(returnQuantity.add(new BigDecimal(bag)));
}
stockOutOrderService.updateById(stockOutOrder);
}
}
mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
+9 -1
View File
@@ -95,6 +95,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="reservationOrderSource" column="RESERVATION_ORDER_SOURCE" />
<result property="outboundTime" column="OUTBOUND_TIME" />
<result property="businessOrderNo" column="BUSINESS_ORDER_NO" />
<result property="returnQuantity" column="RETURN_QUANTITY" />
<result property="deliveryName" column="DELIVERY_NAME" />
<result property="customerNumber" column="CUSTOMER_NUMBER" />
<result property="invoiceNumber" column="INVOICE_NUMBER" />
<result property="returnOrderNumber" column="RETURN_ORDER_NUMBER" />
<result property="totalAmount" column="TOTAL_AMOUNT" />
<result property="route" column="ROUTE" />
</resultMap>
@@ -112,7 +119,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.COMPLETE_TIME,a.ORDER_DATE,a.TRANSPORT_MODE_CODE,a.TRANSPORT_MODE_NAME,a.SUPERVISION_MODE_CODE,a.SUPERVISION_MODE_NAME,
a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,a.reservation_audit_time,a.reservation_audit_name
,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.tms_order_number,
a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.RESERVATION_ORDER_SOURCE,a.OUTBOUND_TIME
a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.RESERVATION_ORDER_SOURCE,a.OUTBOUND_TIME,a.RETURN_QUANTITY,a.DELIVERY_NAME,a.CUSTOMER_NUMBER,a.INVOICE_NUMBER,a.RETURN_ORDER_NUMBER,a.TOTAL_AMOUNT,
a.ROUTE
</sql>