Merge branch 'master' of xwh/wms into master

wms-core-service/src/main/java/com/lote/wms/outstock/order/service/impl/OutOrderServiceImpl.java

@@ -2,15 +2,7 @@ package com.lote.wms.outstock.order.service.impl;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -3030,6 +3022,11 @@ public class OutOrderServiceImpl implements OutOrderService {
 		vo.setItemList(itemList);
 
 		List<OutInventoryAllocation> allocationList = outInventoryAllocationService.listGpBatchByOrderId(orderId);
+		if (Objects.nonNull(allocationList) && allocationList.size()>0){
+			for (OutInventoryAllocation allocation : allocationList) {
+				allocation.setExtend5(DateUtil.dateConvertString(allocation.getExpiryDate(), "yyyy-MM-dd"));
+			}
+		}
 		vo.setAllocationList(allocationList);
 
 		// 获取仓库地址

wms-operate/src/main/java/com/lote/wms/controller/operate/outstock/order/PrintInvoiceController.java

@@ -80,11 +80,7 @@ public class PrintInvoiceController extends AbstractController {
 			OutOrderResultVo vo = outOrderService.getPrintInvoiceData(orderId);
 			list.add(vo);
 		}
-
-//		view.addObject("list", list);
-//		view.addObject("time", DateUtil.dateConvertString(new Date(), "yyyy/MM/dd HH:mm:ss"));
-//		view.addObject("date", DateUtil.dateConvertString(new Date(), "dd.MM.yyyy"));
-//
+		list.get(0).setExtend9(DateUtil.dateConvertString(new Date(), "dd.MM.yyyy"));
 		return Result.success(list);
 	}
 }

wms-operate/src/main/resources/static/ui/views/outstock/order/printInvoice/standard-a4New.html

@@ -139,6 +139,7 @@
 				<%=data[i].warehouseAddress.address%><br>
 				<%=data[i].warehouseAddress.postalCode%> &nbsp;&nbsp;<%=data[i].warehouseAddress.city%><br>
 <!--				${date}-->
+				<%=data[0].extend9%>
 				<br>
 
 			</div>
@@ -176,6 +177,8 @@
 					</td>
 					<td style=" padding-left: 10px;">
 <!--						<fmt:formatDate value="<%=data[i].allocationList[j].expiryDate%>" type="date" pattern="yyyy-MM-dd"/>-->
+<!--						<%=data[i].allocationList[j].expiryDate.format('yyyy-MM-dd')%>-->
+						<%=data[i].allocationList[j].extend5%>
 					</td>
 					<td style=" padding-left: 10px;"><%=data[i].allocationList[j].quantity%></td>
 				</tr>

wms-operate/src/main/resources/static/ui/views/outstock/order/printInvoice/standard-a5New.html

@@ -138,6 +138,7 @@
 				<%=data[i].warehouseAddress.address%><br>
 				<%=data[i].warehouseAddress.postalCode%> &nbsp;&nbsp;<%=data[i].warehouseAddress.city%><br>
 				<!--				${date}-->
+				<%=data[0].extend9%>
 				<br>
 
 			</div>
@@ -175,6 +176,7 @@
 				</td>
 				<td style=" padding-left: 10px;">
 					<!--						<fmt:formatDate value="<%=data[i].allocationList[j].expiryDate%>" type="date" pattern="yyyy-MM-dd"/>-->
+					<%=data[i].allocationList[j].extend5%>
 				</td>
 				<td style=" padding-left: 10px;"><%=data[i].allocationList[j].quantity%></td>
 			</tr>