xwh提交代码

wms-center/build.gradle

@@ -53,7 +53,7 @@ dependencies {
 	// jackson
 	implementation "com.fasterxml.jackson.core:jackson-databind:${jackson}"
 	implementation "com.fasterxml.jackson.core:jackson-core:${jackson}"
-	implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson}"
+//	implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson}"
 
 	implementation "com.google.code.gson:gson:${gson}"
 	implementation "com.alibaba:fastjson:${fastjson}"

wms-client/build.gradle

@@ -49,7 +49,7 @@ dependencies {
     // jackson
     implementation "com.fasterxml.jackson.core:jackson-databind:${jackson}"
     implementation "com.fasterxml.jackson.core:jackson-core:${jackson}"
-    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson}"
+//    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson}"
 
     implementation "com.google.code.gson:gson:${gson}"
     implementation "com.alibaba:fastjson:${fastjson}"

wms-common/build.gradle

@@ -30,7 +30,7 @@ dependencies {
     // jackson
     implementation "com.fasterxml.jackson.core:jackson-databind:${jackson}"
     implementation "com.fasterxml.jackson.core:jackson-core:${jackson}"
-    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson}"
+//    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson}"
 
     implementation "com.google.code.gson:gson:${gson}"
     implementation "com.alibaba:fastjson:${fastjson}"

wms-core-service/build.gradle

@@ -35,7 +35,7 @@ dependencies {
     // jackson
     implementation "com.fasterxml.jackson.core:jackson-databind:${jackson}"
     implementation "com.fasterxml.jackson.core:jackson-core:${jackson}"
-    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson}"
+//    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson}"
 
     implementation "com.google.code.gson:gson:${gson}"
     implementation "com.alibaba:fastjson:${fastjson}"

wms-operate/src/main/java/com/lote/wms/controller/operate/outstock/wave/OutWaveController.java

@@ -25,7 +25,9 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 //单品单件波次:  多个订单都是出同1个SKU, 1个数量.
 //单品多件波次:  多个订单都是出同1个SKU, 相同数量.
@@ -38,7 +40,7 @@ import java.util.List;
 //
 //
 //
-//杂品波次 
+//杂品波次
 //1.打印波次拣货单和每个订单的拣货单
 //2.通常用边拣边分 , 先拣再分则需要PDA辅助, 扫描商品条码,由PDA提示放入几号订单
 //3.拣货完成后,最好做装箱验证(每个订单的商品不一致,容易装错)
@@ -74,7 +76,7 @@ public class OutWaveController extends AbstractController {
 
 	/**
 	 * 波次列表
-	 * 
+	 *
 	 * @param vo
 	 * @return
 	 */
@@ -86,10 +88,10 @@ public class OutWaveController extends AbstractController {
 
 	/**
 	 * 打印
-	 * 
+	 *
 	 * 只打印波次拣货单
-	 * 
-	 * 
+	 *
+	 *
 	 * @param id
 	 * @return
 	 */
@@ -101,8 +103,9 @@ public class OutWaveController extends AbstractController {
 
 	/**
 	 * 更新打印拣货单状态
-	 * 
-	 * @param orderIdList
+	 *
+	 * @param isUpdateStatus
+	 * @param waveIds
 	 * @return
 	 */
 	@RequestMapping("printUpdate")
@@ -113,9 +116,27 @@ public class OutWaveController extends AbstractController {
 	}
 
 	/**
+	 * 打印波次拣货单(新版本)
+	 *
+	 * @param waveIds
+	 * @return
+	 */
+	@PostMapping("printWaveHtml")
+	@ResponseBody
+	public Result printWaveHtml(@RequestBody String waveIds) {
+		List<String> idArray = StringUtil.stringToList(waveIds, String.class, ",");
+		List<OutWaveExpand> list = new ArrayList<OutWaveExpand>();
+		for (String id : idArray) {
+			OutWaveExpand printDetail = outWaveService.getPrintDetail(id);
+			list.add(printDetail);
+		}
+		return Result.success(list);
+	}
+
+	/**
 	 * 打印波次拣货单
-	 * 
-	 * @param orderIds
+	 *
+	 * @param waveIds
 	 * @return
 	 */
 	@RequestMapping("printWave")
@@ -135,10 +156,45 @@ public class OutWaveController extends AbstractController {
 		return view;
 	}
 
+
+	/**
+	 * 批量打印波次和订单(新版本)
+	 *
+	 * @param waveIds
+	 * @return
+	 */
+	@PostMapping("printWaveAndOrderHtml")
+	@ResponseBody
+	public Result printWaveAndOrderHtml(@RequestBody String waveIds) {
+		List<String> idArray = StringUtil.stringToList(waveIds, String.class, ",");
+
+		List<OutWaveExpand> list = new ArrayList<OutWaveExpand>();
+		for (String waveId : idArray) {
+			OutWaveExpand printDetail = outWaveService.getPrintDetail(waveId);
+
+			List<String> orderIds = outWaveItemService.listOrderIdByWaveId(waveId);
+			if (orderIds.size() < 0) {
+				continue;
+			}
+
+			// 更新订单打印拣货单次数
+			outOrderService.printOutShelfUpdate(BaseConstant.Y, StringUtil.concatList(orderIds), this.getUser());
+
+			Message message = outOrderService.getPrintOutShelfData(orderIds, this.getUser());
+			List<PrintForOutShelf> printDtoList = (ArrayList<PrintForOutShelf>) message.getExtend();
+
+			printDetail.setPrintDtoList(printDtoList);
+			list.add(printDetail);
+		}
+		return Result.success(list);
+	}
+
+
+
 	/**
 	 * 批量打印波次和订单
-	 * 
-	 * @param orderIds
+	 *
+	 * @param waveIds
 	 * @return
 	 */
 	@RequestMapping("printWaveAndOrder")
@@ -172,8 +228,8 @@ public class OutWaveController extends AbstractController {
 
 	/**
 	 * 打印运单
-	 * 
-	 * @param orderIds
+	 *
+	 * @param waveIds
 	 * @return
 	 */
 	@RequestMapping("printShippingLabel")
@@ -187,7 +243,7 @@ public class OutWaveController extends AbstractController {
 
 	/**
 	 * 是否允许操作
-	 * 
+	 *
 	 * @param waveNo
 	 * @return
 	 */
@@ -205,8 +261,8 @@ public class OutWaveController extends AbstractController {
 
 	/**
 	 * 查询待称重的波次
-	 * 
-	 * @param vo
+	 *
+	 * @param waveNo
 	 * @return
 	 */
 	@RequestMapping(value = "/selectForWeigh", method = RequestMethod.POST)
@@ -217,9 +273,9 @@ public class OutWaveController extends AbstractController {
 
 	/**
 	 * 订单分组, 按波次查询, 按skuQtyDigest分组
-	 * 
+	 *
 	 * 按分组批量称重
-	 * 
+	 *
 	 * @param waveNo
 	 * @return
 	 */
@@ -231,8 +287,8 @@ public class OutWaveController extends AbstractController {
 
 	/**
 	 * 按订单典型分组批量称重
-	 * 
-	 * 
+	 *
+	 *
 	 * @param vo
 	 * @return
 	 */
@@ -243,7 +299,7 @@ public class OutWaveController extends AbstractController {
 
 	/**
 	 * 按类型统计
-	 * 
+	 *
 	 * @param type
 	 * @return
 	 */
@@ -256,7 +312,7 @@ public class OutWaveController extends AbstractController {
 
 	/**
 	 * 根据波次id 获取订单id
-	 * 
+	 *
 	 * @param waveIds
 	 * @return
 	 */
@@ -285,9 +341,9 @@ public class OutWaveController extends AbstractController {
 			}
 
 		}
-		
+
 		alllist.add(StringUtil.concatList(list));
-		
+
 		return Result.success(alllist);
 	}
 }

wms-operate/src/main/resources/static/ui/js/outstock/wave/outWave/list.js

@@ -102,9 +102,9 @@ function printWave(){
        		  	    }
          		    
          		    //打印尺寸
-         		    var href = '/outstock/outWave/printWave?printSize={printSize}&waveIds={waveIds}';
+					var href = '';
+					href =  _ctx + '/views/outstock/wave/outWave/print/printWaveNew.html?waveIds={waveIds}';
          		    href = href.replace("{waveIds}",waveIds);
-         		    href = href.replace("{printSize}",printSize);
          		    window.open(href);
    	        		
    	        		//是否刷新
@@ -178,9 +178,9 @@ function printWaveAndOrder(){
        		  	    }
          		    
          		    //打印尺寸
-         		    var href = '/outstock/outWave/printWaveAndOrder?printSize={printSize}&waveIds={waveIds}';
-         		    href = href.replace("{waveIds}",waveIds);
-         		    href = href.replace("{printSize}",printSize);
+					var href = '';
+					href =  _ctx + '/views/outstock/wave/outWave/print/printWaveAndOrderNew.html?waveIds={waveIds}';
+					href = href.replace("{waveIds}",waveIds);
          		    window.open(href);
    	        		
    	        		//是否刷新

wms-operate/src/main/resources/static/ui/views/outstock/wave/outWave/print/printWaveAndOrderNew.html

@@ -0,0 +1,392 @@
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<!-- 避免IE使用兼容模式 -->
+	<meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
+	<meta name="renderer" content="webkit">
+<title>JWMS 拣货单打印</title>
+	<!-- 浏览器标签图片 -->
+	<link rel="shortcut icon" href="./topjui/image/favicon.ico" />
+	<!-- jQuery相关引用 -->
+	<script type="text/javascript" src="/ui/static/plugins/jquery/jquery.min.js"></script>
+	<script type="text/javascript" src="/ui/static/plugins/jquery/jquery.cookie.js"></script>
+	<script type="text/javascript" src="/ui/static/public/js/baiduTemplate.js"></script>
+	<script type="text/javascript" src="/ui/static/3rd/jsbarcode/JsBarcode.all.min.js"></script>
+	<script type="text/javascript" src="/ui/static/public/js/common.js?v=1"></script>
+
+	<!-- 进度条 -->
+	<script src="/ui/static/3rd/pace/pace.js"></script>
+	<link rel="stylesheet" href="/ui/static/3rd/pace/themes/blue/pace-theme-center-simple.css" />
+	<!-- 	<link rel="stylesheet" href="/ui/static/plugins/bootstrap/css/bootstrap.css" /> -->
+	<link rel="stylesheet" href="/ui/static/public/css/print/printOutShelf.css" />
+</head>
+
+<!-- print-page-a4 限制了页面宽度210mm -->
+<body class="print-page-a4">
+
+</body>
+
+
+<script type="text/javascript">
+	$(function () {
+		var waveIds = getParam('waveIds');
+		if(waveIds == null || waveIds ==''){
+			return;
+		}
+		$.ajax({
+			type: "POST",
+			url: "/outstock/outWave/printWaveAndOrderHtml",
+			contentType:"application/json",
+			data:waveIds,
+			success: function(msg){
+				console.log(msg);
+				if(msg.code!=0){
+					alert("加载数据失败,"+msg.msg);
+					return
+				}
+				//填充数据
+				var html = baidu.template('printBody',msg);
+				$("body").html(html);
+				loadBarcode();
+				hideLoad();
+			},
+			error: function () {
+				$.iMessager.alert('注意', '网络断开或服务器已停止运行', 'messager-warning');
+			}
+		},"json");
+
+		function hideLoad(){
+			//进度条隐藏
+			Pace.on('hide', function(){
+				console.info('加载完毕');
+			});
+		}
+
+		function loadBarcode() {
+			//console.info("loadBarcode...");
+			$(".printCode").each(function () {
+				str = $(this).attr('title');
+				$(this).JsBarcode(str, {
+					width: 1,
+					height: "40mm",
+					format: "code128",
+					displayValue: true,
+					margin: 0
+				});
+			});
+		}
+		loadBarcode();
+		setTimeout(function () {
+			loadBarcode();
+		}, 5000);
+
+		//180秒后自动关闭
+		setTimeout(function () {
+			window.opener = null; window.close();
+		}, 180000);
+
+
+	});
+</script>
+
+
+
+
+
+<script id="printBody" type="text/html">
+
+	<%for(var i=0;i<data.length;i++){%>
+	<div class='a4-for-packagelist change-page' style="margin-left: 4mm;">
+		<div style="height:5mm;weight:100%;"></div>
+
+		<div style="height:8mm;weight:100%;text-align: center;font-size: 7mm;font-weight: bold;">
+			波次拣货单
+		</div>
+
+		<div style="height:20mm;width:100%;margin-top: 10mm;">
+			<table>
+				<tr>
+					<td style="height:15mm;width:120mm;">
+						<span class="pull-left" style="margin-top: 4mm;"><b>波次号码 : </b></span>
+						<img class="printCode" title="<%=data[i].waveNo%>">
+					</td>
+					<td><b>仓库: </b><%=data[i].warehouseCode%></td>
+				</tr>
+				<tr>
+					<td><b>发货日期 : </b><%=data[i].printDate%></td>
+					<td><b>货主: </b><%=data[i].customerCode%></td>
+				</tr>
+
+				<tr>
+					<td><b>运输渠道 : </b><%=data[i].shipwayCode%></td>
+					<td><b>货区: </b><%=data[i].zoneCode%></td>
+				</tr>
+			</table>
+		</div>
+
+		<div style="width:100%;">
+			<table style="width:100%;height:auto;margin-left: 0.5mm;margin-top: 10mm;" rules="all" border="1">
+				<tr style="height:6mm;">
+					<th style="width:8mm;text-align: center;">序号</th>
+					<th style="width:40mm;text-align:center">商品条码</th>
+					<th style="width:36mm;text-align:center">商品名称</th>
+					<th style="width:20mm;text-align:center">商品规格</th>
+					<th style="width:36mm;text-align:center">货位号码</th>
+					<th style="width:15mm;text-align:center">数量</th>
+					<th style="width:25mm;text-align:center">分拣</th>
+				</tr>
+				<%for(var j=0;j<data[i].unOutShelfList.length;j++){%>
+				<tr style="height:8mm;">
+					<td style="width:8mm;height:8mm; text-align: center;">
+						<%=j+1%>
+					</td>
+					<td style="width:40;font-size: 16px;text-align: center;">
+						<div style="width:40mm;">
+							<b><%=data[i].unOutShelfList[j].barcode%></b>
+						</div>
+					</td>
+					<td style="width:36mm;text-align: center;overflow: ">
+						<div style="width:36mm;">
+							<%=data[i].unOutShelfList[j].productName%>
+						</div>
+					</td>
+					<td style="width:20mm;text-align: center;overflow: ">
+						<div style="width:20mm;">
+							<%=data[i].unOutShelfList[j].model%>
+						</div>
+					</td>
+					<td style="width:36mm;font-size: 16px;text-align: center;">
+						<div style="width:36mm;">
+							<b><%=data[i].unOutShelfList[j].locationCode%></b>
+						</div>
+					</td>
+					<td style="width:15mm;text-align: center;">
+						<div style="width:15mm;">
+							<%=data[i].unOutShelfList[j].quantity%>
+						</div>
+					</td>
+					<td style="width:25mm;text-align: center;overflow: ">
+						<div style="width:25mm;">
+							<%=data[i].unOutShelfList[j].extend4%>
+						</div>
+					</td>
+				</tr>
+				<%}%>
+
+				<tr>
+					<td colspan="8" style="height:8mm;text-align: right;">
+						<span style="margin-right: 5mm;">
+							合计:<%=data[i].unOutShelfQty%>
+						</span>
+					</td>
+				</tr>
+			</table>
+
+			<table style="width:100%;height:auto;margin-left: 0.5mm;margin-top: 5mm;" rules="all" border="1">
+				<tr>
+					<th colspan="8">
+						<h3 style="color:red;"><b>注意:以下是此波次内已下架的商品和货位信息</b></h3>
+					</th>
+				</tr>
+				<tr style="height:6mm;">
+					<th style="width:8mm;text-align: center;">序号</th>
+					<th style="width:40mm;text-align:center">商品条码</th>
+					<th style="width:36mm;text-align:center">商品名称</th>
+					<th style="width:20mm;text-align:center">商品规格</th>
+					<th style="width:36mm;text-align:center">货位号码</th>
+					<th style="width:15mm;text-align:center">已下架数量</th>
+					<th style="width:25mm;text-align:center">分拣</th>
+				</tr>
+
+				<%for(var j=0;j<data[i].alreadyOutShelfList.length;j++){%>
+				<tr style="height:8mm;">
+					<td style="width:8mm;height:8mm; text-align: center;">
+						<%=j+1%>
+					</td>
+					<td style="width:40mm;font-size: 16px;text-align: center;">
+						<div style="width:40mm;">
+							<b><%=data[i].alreadyOutShelfList[j].barcode%></b>
+						</div>
+					</td>
+					<td style="width:36mm;text-align: center;overflow: ">
+						<div style="width:36mm;">
+							${outShelfed.productName}
+						</div>
+					</td>
+					<td style="width:20mm;text-align: center;overflow: ">
+						<div style="width:20mm;">
+							${outShelfed.model}
+						</div>
+					</td>
+					<td style="width:36mm;font-size: 16px;text-align: center;">
+						<div style="width:36mm;">
+							<b>${outShelfed.locationCode}</b>
+						</div>
+					</td>
+					<td style="width:15mm;text-align: center;">
+						<div style="width:15mm;">
+							${outShelfed.quantity}
+						</div>
+					</td>
+					<td style="width:25mm;text-align: center;overflow: ">
+						<div style="width:25mm;">
+							${outShelfed.extend4}
+						</div>
+					</td>
+				</tr>
+				<%}%>
+
+				<tr>
+					<td colspan="8" style="height:8mm;text-align: right;">
+										<span style="margin-right: 5mm;">
+											合计:<%=data[i].alreadyOutShelfQty%>
+										</span>
+					</td>
+				</tr>
+			</table>
+		</div>
+		<div style="width:100%;text-align: left;margin-left: 0mm; font-size:5mm; margin-top: 10mm;">
+			订单数量: <b><%=data[i].orderCount%></b> 个
+		</div>
+	</div>
+	<!-- 波次内容结束,开始订单内容 -->
+
+
+		<%for(var j=0;j<data[i].printDtoList.length;j++){%>
+		<div class='a4-for-packagelist change-page' style="margin-left: 5mm;">
+			<div style="height:2mm;width:100%;"></div>
+			<!-- <span style="font-size: 16px;"><b>跟踪单号:</b></span> -->
+			<span style="font-size: 20px;font-weight:normal;" class="trackingNo"><%=data[i].printDtoList[j].trackingNo%></span>
+			<div style="height:20mm;width:100%;text-align: center;font-size: 7mm;font-weight: bold;">仓库发货清单</div>
+
+			<div class="pull-left" style="width:100%;height:20mm; font-size: 4.5mm;text-align: right;">
+				<table class="pull-left" style="width: 120mm;text-align: left;" rules="all" >
+					<tr>
+						<td style="height:10mm;width:120mm;">
+							<span class="pull-left" style="margin-top: 4mm;">
+								<b>出库单号: &nbsp;</b>
+							</span>
+							<img class="printCode" title="<%=data[i].printDtoList[j].orderNo%>" src=""></td>
+					</tr>
+				</table>
+
+				<table class="pull-right" style="border:1px solid #000;width: 65mm;" rules="all">
+					<tr>
+						<td colspan="2" style="text-align: center;font-size: 5mm;font-weight: bold;">
+							<%=data[i].printDtoList[j].shipwayCode%>
+						</td>
+					</tr>
+					<tr>
+						<td style="text-align: center;font-size: 4mm;">波次:<%=data[i].printDtoList[j].batchNo%></td>
+						<td style="height: 12px;width:15mm; text-align: center;font-size: 5mm;font-weight: bold;">
+							<%=data[i].printDtoList[j].batchIndex%>
+						</td>
+					</tr>
+				</table>
+			</div>
+
+			<div style="height:25mm;width:100%;">
+				<table style="width:100%;">
+					<tr>
+						<td>
+							<b>收货人:</b>
+							<%=data[i].printDtoList[j].outOrderReceiverName%></td>
+
+						<td style="text-align: right;">
+							<b>发货日期 :</b>
+							<%=data[i].printDtoList[j].printDate%></td>
+					</tr>
+				</table>
+			</div>
+
+			<div style="width:100%;height:auto;">
+				<table style="width:100%;height:auto;margin-left: 0mm;margin-top: 10mm;" rules="all" border="1">
+					<tr style="height:6mm;">
+						<th>
+							<div style="width:10mm;text-align:center;">序号</div>
+						</th>
+						<th>
+							<div style="width:45mm;text-align:center;">商品条码</div>
+						</th>
+						<th>
+							<div style="width:45mm;text-align:center;overflow: hidden;">商品名称</div>
+						</th>
+						<th>
+							<div style="width:50mm;text-align:center;">库位号</div>
+						</th>
+						<th>
+							<div style="width:20mm;text-align:center;">数量</div>
+						</th>
+						<th>
+							<div style="width:20mm;text-align:center;">包装材料</div>
+						</th>
+					</tr>
+
+					<%for(var k=0;k<data[i].printDtoList[j].printForOutShelfItemList.length;k++){%>
+						<tr style="height:8mm;">
+							<td>
+								<div style="width:10mm;text-align:center;"><%=k+1%></div>
+							</td>
+
+							<td>
+								<div style="width:45mm;text-align:center;">
+									<b><%=data[i].printDtoList[j].printForOutShelfItemList[k].barcode%></b>
+								</div>
+							</td>
+
+							<td>
+								<div style="width:45mm;text-align:center;overflow: hidden;">
+									<%=data[i].printDtoList[j].printForOutShelfItemList[k].productName%>
+								</div>
+							</td>
+
+							<td>
+								<div style="width:50mm;text-align:center;">
+									<b><%=data[i].printDtoList[j].printForOutShelfItemList[k].locationCode%></b>
+								</div>
+							</td>
+
+							<td>
+								<div style="width:20mm;text-align:center;">
+									<%=data[i].printDtoList[j].printForOutShelfItemList[k].count%>
+								</div>
+							</td>
+
+
+							<% if(k==0){ %>
+							<td rowspan="<%=data[i].printDtoList[j].printForOutShelfItemList.length%>" style="width:14mm;text-align: center;border-bottom: white;border-top: white;font-weight: bold">
+								<div style="width:20mm;text-align:center;">
+									<%=data[i].printDtoList[j].packagingType%>
+								</div>
+							</td>
+							<% }%>
+						</tr>
+					<%}%>
+
+
+					<tr>
+						<td colspan="5" style="height:8mm;text-align: right;">
+							<span style="margin-right: 5mm;">合计:
+								<%=data[i].printDtoList[j].totalCount%></span>
+						</td>
+						<td style="height:8mm;text-align: right;white;border-top: white;"></td>
+					</tr>
+				</table>
+			</div>
+
+			<div style="height:12mm;weight:100%;margin-top: 15mm;font-size: 4mm;">
+				<div style="height:6mm;">非常感謝您的购物！ 我們期待您的再次光临 !</div>
+				<div style="height:6mm;">如发现商品破损或与描述不符等任何问题, 请及时联系我们客服。</div>
+			</div>
+			<div style="height:15mm;weight:100%;"></div>
+			<div style="height:50mm;weight:100%;margin-top: 5mm;font-size: 4mm;"></div>
+		</div>
+		<%}%>
+	<%}%>
+
+
+</script>
+
+
+
+
+</html>

wms-operate/src/main/resources/static/ui/views/outstock/wave/outWave/print/printWaveNew.html

@@ -0,0 +1,258 @@
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<!-- 避免IE使用兼容模式 -->
+	<meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
+	<meta name="renderer" content="webkit">
+<title>JWMS 拣货单打印</title>
+<!-- 浏览器标签图片 -->
+<link rel="shortcut icon" href="./topjui/image/favicon.ico" />
+<!-- jQuery相关引用 -->
+<script type="text/javascript" src="/ui/static/plugins/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="/ui/static/plugins/jquery/jquery.cookie.js"></script>
+	<script type="text/javascript" src="/ui/static/public/js/baiduTemplate.js"></script>
+<script type="text/javascript" src="/ui/static/3rd/jsbarcode/JsBarcode.all.min.js"></script>
+<script type="text/javascript" src="/ui/static/public/js/common.js?v=1"></script>
+<!-- 进度条 -->
+<script src="/ui/static/3rd/pace/pace.js"></script>
+<link rel="stylesheet" href="/ui/static/3rd/pace/themes/blue/pace-theme-center-simple.css" />
+<!-- 	<link rel="stylesheet" href="/ui/static/plugins/bootstrap/css/bootstrap.css" /> -->
+<link rel="stylesheet" href="/ui/static/public/css/print/printOutShelf.css" />
+</head>
+
+<!-- print-page-a4 限制了页面宽度210mm -->
+<body class="print-page-a4">
+
+</body>
+
+
+<script type="text/javascript">
+	$(function () {
+		var waveIds = getParam('waveIds');
+		if(waveIds == null || waveIds ==''){
+			return;
+		}
+		$.ajax({
+			type: "POST",
+			url: "/outstock/outWave/printWaveHtml",
+			contentType:"application/json",
+			data:waveIds,
+			success: function(msg){
+				console.log(msg);
+				if(msg.code!=0){
+					alert("加载数据失败,"+msg.msg);
+					return
+				}
+				//填充数据
+				var html = baidu.template('printBody',msg);
+				$("body").html(html);
+				loadBarcode();
+				hideLoad();
+			},
+			error: function () {
+				$.iMessager.alert('注意', '网络断开或服务器已停止运行', 'messager-warning');
+			}
+		},"json");
+
+		function hideLoad(){
+			//进度条隐藏
+			Pace.on('hide', function(){
+				console.info('加载完毕');
+			});
+		}
+
+		function loadBarcode() {
+			//console.info("loadBarcode...");
+			$(".printCode").each(function () {
+				str = $(this).attr('title');
+				$(this).JsBarcode(str, {
+					width: 1,
+					height: "40mm",
+					format: "code128",
+					displayValue: true,
+					margin: 0
+				});
+			});
+		}
+		loadBarcode();
+		setTimeout(function () {
+			loadBarcode();
+		}, 5000);
+
+		//180秒后自动关闭
+		setTimeout(function () {
+			window.opener = null; window.close();
+		}, 180000);
+
+
+	});
+</script>
+
+
+
+
+
+<script id="printBody" type="text/html">
+	<%for(var i=0;i<data.length;i++){%>
+		<div id="waveListWapper" class='a4-for-packagelist change-page' style="margin-left: 4mm;">
+			<div style="height:5mm;weight:100%;"></div>
+
+			<div style="height:8mm;weight:100%;text-align: center;font-size: 7mm;font-weight: bold;">
+				波次拣货单
+			</div>
+
+			<div style="height:20mm;width:100%;margin-top: 10mm;">
+				<table>
+					<tr>
+						<td style="height:15mm;width:120mm;">
+							<span class="pull-left" style="margin-top: 4mm;"><b>波次号码 : </b></span>
+							<img class="printCode" title="<%=data[i].waveNo%>">
+						</td>
+						<td><b>仓库: </b><%=data[i].warehouseCode%></td>
+					</tr>
+					<tr>
+						<td><b>发货日期 : </b><%=data[i].printDate%></td>
+						<td><b>货主: </b><%=data[i].customerCode%></td>
+					</tr>
+
+					<tr>
+						<td><b>运输渠道 : </b><%=data[i].shipwayCode%></td>
+						<td><b>货区: </b><%=data[i].zoneCode%></td>
+					</tr>
+				</table>
+			</div>
+
+			<div style="width:100%;">
+				<table style="width:100%;height:auto;margin-left: 0.5mm;margin-top: 10mm;" rules="all" border="1">
+					<tr style="height:6mm;">
+						<th style="width:8mm;text-align: center;">序号</th>
+						<th style="width:40mm;text-align:center">商品条码</th>
+						<th style="width:36mm;text-align:center">商品名称</th>
+						<th style="width:20mm;text-align:center">商品规格</th>
+						<th style="width:36mm;text-align:center">货位号码</th>
+						<th style="width:15mm;text-align:center">数量</th>
+						<th style="width:25mm;text-align:center">分拣</th>
+					</tr>
+						<%for(var j=0;j<data[i].unOutShelfList.length;j++){%>
+						<tr style="height:8mm;">
+							<td style="width:8mm;height:8mm; text-align: center;">
+								<%=j+1%>
+							</td>
+							<td style="width:40;font-size: 16px;text-align: center;">
+								<div style="width:40mm;">
+									<b><%=data[i].unOutShelfList[j].barcode%></b>
+								</div>
+							</td>
+							<td style="width:36mm;text-align: center;overflow: ">
+								<div style="width:36mm;">
+									<%=data[i].unOutShelfList[j].productName%>
+								</div>
+							</td>
+							<td style="width:20mm;text-align: center;overflow: ">
+								<div style="width:20mm;">
+									<%=data[i].unOutShelfList[j].model%>
+								</div>
+							</td>
+							<td style="width:36mm;font-size: 16px;text-align: center;">
+								<div style="width:36mm;">
+									<b><%=data[i].unOutShelfList[j].locationCode%></b>
+								</div>
+							</td>
+							<td style="width:15mm;text-align: center;">
+								<div style="width:15mm;">
+									<%=data[i].unOutShelfList[j].quantity%>
+								</div>
+							</td>
+							<td style="width:25mm;text-align: center;overflow: ">
+								<div style="width:25mm;">
+									<%=data[i].unOutShelfList[j].extend4%>
+								</div>
+							</td>
+						</tr>
+						<%}%>
+
+					<tr>
+						<td colspan="8" style="height:8mm;text-align: right;">
+									<span style="margin-right: 5mm;">
+										合计:<%=data[i].unOutShelfQty%>
+									</span>
+						</td>
+					</tr>
+				</table>
+
+				<table style="width:100%;height:auto;margin-left: 0.5mm;margin-top: 5mm;" rules="all" border="1">
+						<tr>
+							<th colspan="8">
+								<h3 style="color:red;"><b>注意:以下是此波次内已下架的商品和货位信息</b></h3>
+							</th>
+						</tr>
+						<tr style="height:6mm;">
+							<th style="width:8mm;text-align: center;">序号</th>
+							<th style="width:40mm;text-align:center">商品条码</th>
+							<th style="width:36mm;text-align:center">商品名称</th>
+							<th style="width:20mm;text-align:center">商品规格</th>
+							<th style="width:36mm;text-align:center">货位号码</th>
+							<th style="width:15mm;text-align:center">已下架数量</th>
+							<th style="width:25mm;text-align:center">分拣</th>
+						</tr>
+
+						<%for(var j=0;j<data[i].alreadyOutShelfList.length;j++){%>
+						<tr style="height:8mm;">
+							<td style="width:8mm;height:8mm; text-align: center;">
+								<%=j+1%>
+							</td>
+							<td style="width:40mm;font-size: 16px;text-align: center;">
+								<div style="width:40mm;">
+									<b><%=data[i].alreadyOutShelfList[j].barcode%></b>
+								</div>
+							</td>
+							<td style="width:36mm;text-align: center;overflow: ">
+								<div style="width:36mm;">
+									${outShelfed.productName}
+								</div>
+							</td>
+							<td style="width:20mm;text-align: center;overflow: ">
+								<div style="width:20mm;">
+									${outShelfed.model}
+								</div>
+							</td>
+							<td style="width:36mm;font-size: 16px;text-align: center;">
+								<div style="width:36mm;">
+									<b>${outShelfed.locationCode}</b>
+								</div>
+							</td>
+							<td style="width:15mm;text-align: center;">
+								<div style="width:15mm;">
+									${outShelfed.quantity}
+								</div>
+							</td>
+							<td style="width:25mm;text-align: center;overflow: ">
+								<div style="width:25mm;">
+									${outShelfed.extend4}
+								</div>
+							</td>
+						</tr>
+						<%}%>
+
+						<tr>
+							<td colspan="8" style="height:8mm;text-align: right;">
+										<span style="margin-right: 5mm;">
+											合计:<%=data[i].alreadyOutShelfQty%>
+										</span>
+							</td>
+						</tr>
+					</table>
+			</div>
+
+			<div style="width:100%;text-align: left;margin-left: 0mm; font-size:5mm; margin-top: 10mm;">
+				订单数量: <b><%=data[i].orderCount%></b> 个
+			</div>
+		</div>
+	<%}%>
+
+
+</script>
+
+
+
+
+</html>

wms-task/build.gradle

@@ -42,7 +42,7 @@ dependencies {
     // jackson
     implementation "com.fasterxml.jackson.core:jackson-databind:${jackson}"
     implementation "com.fasterxml.jackson.core:jackson-core:${jackson}"
-    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson}"
+//    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson}"
 
     implementation "com.google.code.gson:gson:${gson}"
     implementation "com.alibaba:fastjson:${fastjson}"

wms-third/build.gradle

@@ -34,7 +34,7 @@ dependencies {
     // jackson
     implementation "com.fasterxml.jackson.core:jackson-databind:${jackson}"
     implementation "com.fasterxml.jackson.core:jackson-core:${jackson}"
-    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson}"
+//    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson}"
 
     implementation "com.google.code.gson:gson:${gson}"
     implementation "com.alibaba:fastjson:${fastjson}"