xwh增加确认库存确认完结等操作

wms-config/src/main/resources/activemq.properties

@@ -8,7 +8,7 @@ activemq.port=61616
 activemq.username=admin
 activemq.password=admin
 activemq.sessionCacheSize = 100
-
+#
 
 ############## \u6D4B\u8BD5\u73AF\u5883 ################
 
@@ -25,4 +25,4 @@ activemq.sessionCacheSize = 100
 #activemq.username=admin
 #activemq.password=admin
 #activemq.sessionCacheSize = 100
-#
+

wms-config/src/main/resources/operate/redis.properties

@@ -40,7 +40,7 @@ redis.timeout=5000
 
 
 ############## \u751F\u4EA7\u73AF\u5883 ################
-#
+
 ##Redis\u670D\u52A1\u5668IP
 #redis.host=183.3.221.143
 ##Redis\u7684\u7AEF\u53E3\u53F7

wms-config/src/main/resources/operate/system.properties

@@ -2,7 +2,7 @@
 
 
 ############## \u5F00\u53D1\u73AF\u5883 ################
-
+#
 system.sessionIdName=OPERATE_SESSION_ID
 system.runtimeFileDir=E:/upload/test
 system.fileServerUrl=http://127.0.0.1:9093/fileserver/upload
@@ -21,6 +21,6 @@ system.localCurrency=CNY
 
 #system.sessionIdName=OPERATE_SESSION_ID
 #system.runtimeFileDir=/data/file/wms/runtimefile/
-#fsystem.ile_server_url=http://183.3.221.143:9093/fileserver/upload
+#system.fileServerUrl=http://183.3.221.143:9093/fileserver/upload
 #system.localCurrency=CNY
 

wms-core-service/src/main/java/com/lote/wms/instock/shelf/service/impl/InShelfServiceImpl.java

@@ -423,7 +423,11 @@ public class InShelfServiceImpl implements InShelfService {
 		}
 		// 处理入库单状态更新
 		handleStatusForInShelf(inOrder, user, isFinished);
-
+		confirmInventory(inShelf.getId(),user);// 需求要上架后自动确认库存
+		// 如果全完成了 再确认完结
+		if (isFinished) {
+			inOrderService.confirmEnd(inOrder.getId(),user);
+		}
 		message.setSuccess(true);
 		return message;
 	}
@@ -458,6 +462,7 @@ public class InShelfServiceImpl implements InShelfService {
 		// null, msg, true);
 
 		inOrderService.updateStatus(order);
+
 		return;
 	}
 

wms-core-service/src/main/java/com/lote/wms/outstock/boxed/service/impl/OutBoxedItemServiceImpl.java

@@ -494,7 +494,7 @@ public class OutBoxedItemServiceImpl implements OutBoxedItemService {
 			return Message.fail("只有已装箱的订单可以操作导出!");
 		}
 		String headCnStrList[] = new String[] { "序号", "出库单号", "货主代码", "仓库代码", "出库类型", "运输方式", "跟踪单号", "箱号", "sku",
-				"商品条码","批次号","品质等级名称","商品数量","创建时间" };
+				"商品条码","批次号","品质等级名称","商品数量","已装箱数量","创建时间" };
 		Sheet sheet = null;
 		List<String> headCnList = Arrays.asList(headCnStrList);
 		try {
@@ -557,7 +557,8 @@ public class OutBoxedItemServiceImpl implements OutBoxedItemService {
 			row[10] = outBoxedItem.getBatchNo();
 			row[11] = outBoxedItem.getQualityName();
 			row[12] = outBoxedItem.getQuantity().toString();
-			row[13] = outBoxedItem.getCreatedTime().toString();
+			row[13] = outBoxedItem.getQuantity().toString();
+			row[14] = outBoxedItem.getCreatedTime().toString();
 			rows.add(row);
 		}
 		return rows;

wms-core-service/src/main/java/com/lote/wms/outstock/outshelf/entity/resultvo/OutShelfResultVo.java

@@ -23,6 +23,17 @@ public class OutShelfResultVo extends OutShelf {
 	 * 待装箱数量
 	 */
 	private Integer waitBoxQty;
+	
+	
+	private String outBoxedItems;
+
+	public String getOutBoxedItems() {
+		return outBoxedItems;
+	}
+
+	public void setOutBoxedItems(String outBoxedItems) {
+		this.outBoxedItems = outBoxedItems;
+	}
 
 	public Integer getWaitBoxQty() {
 		return waitBoxQty;

wms-core-service/src/main/java/com/lote/wms/outstock/outshelf/service/impl/OutShelfServiceImpl.java

@@ -606,6 +606,17 @@ public class OutShelfServiceImpl implements OutShelfService {
 				productQueryVo.setSku(outShelfResultVo.getSku());
 				Product product = productMapper.getByCustomerAndSku(productQueryVo);
 				outShelfResultVo.setProductName(product.getProductName());
+				List<OutBoxedItem> outBoxedItemList = outBoxedItemService.listByOrderIdAndBarcode(orderId, outShelfResultVo.getBarcode());
+				if (Objects.nonNull(outBoxedItemList) && outBoxedItemList.size()>0){
+					String outBoxedItems = "";
+					for (int i = 0; i < outBoxedItemList.size(); i++) {
+						outBoxedItems+=outBoxedItemList.get(i).getBoxNo();
+						if(i!=outBoxedItemList.size()-1){
+							outBoxedItems+=",";
+						}
+					}
+					outShelfResultVo.setOutBoxedItems(outBoxedItems);
+				}
 			}
 		}
 		message.setExtend(list);

wms-core-service/src/main/resources/mybatis/mapper/outstock/boxed/OutBoxedItemMapper.xml

@@ -49,8 +49,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    id, box_id as boxId, box_no as boxNo, out_order_id as outOrderId, out_order_no as outOrderNo, sku, barcode, batch_no as batchNo, quality_code as qualityCode,
-    quality_name as qualityName, quantity, created_time as createdTime, created_by_user_id as createdByUserId, created_by_user_code as createdByUserCode, extend1,
+    id, box_id, box_no, out_order_id, out_order_no, sku, barcode, batch_no, quality_code,
+    quality_name, quantity, created_time, created_by_user_id, created_by_user_code, extend1,
     extend2
   </sql>
   <select id="selectByConditionList" resultMap="BaseResultMap" parameterType="com.lote.wms.outstock.boxed.entity.OutBoxedItemCriteria" >
@@ -198,7 +198,9 @@
     <select id="selectByOutOrderNo" resultType="com.lote.wms.outstock.boxed.entity.OutBoxedItem">
 
     select
-      <include refid="Base_Column_List" />
+        id, box_id as boxId, box_no as boxNo, out_order_id as outOrderId, out_order_no as outOrderNo, sku, barcode, batch_no as batchNo, quality_code as qualityCode,
+    quality_name as qualityName, quantity, created_time as createdTime, created_by_user_id as createdByUserId, created_by_user_code as createdByUserCode, extend1,
+    extend2
      from out_boxed_item where out_order_no=#{orderNo};
     </select>
     <update id="updateByPrimaryKeySelective" parameterType="com.lote.wms.outstock.boxed.entity.OutBoxedItem" >

wms-operate/src/main/resources/static/ui/js/outstock/boxed/showOutBoxed/main.js

@@ -260,11 +260,12 @@ function refreshItems(){
     			}
     			
     			var tr = "<tr style='height: 15px;' id='item_"+item.id+"'>";
-	    			tr += "<th><div style='width:160px;overflow: auto;'>"+item.sku+"</div></th>";
-	    			tr += "<th><div style='width:180px;overflow: auto;'>"+item.barcode+"</div></th>";
+	    			tr += "<th><div style='width:120px;overflow: auto;'>"+item.sku+"</div></th>";
+	    			tr += "<th><div style='width:120px;overflow: auto;'>"+item.barcode+"</div></th>";
+					tr += "<th><div style='width:120px;overflow: hidden;'>"+item.outBoxedItems+"</div></th>";
 	    			tr += "<th><div style='width:80px;overflow: hidden;'>"+item.totalQty+"</div></th>";
-	    			tr += "<th><div style='width:90px;overflow: hidden;'>"+item.boxedQty+"</div></th>";
-	    			tr += "<th><div style='width:90px;overflow: hidden;'>"+waitBoxQty+"</div></th>";
+	    			tr += "<th><div style='width:80px;overflow: hidden;'>"+item.boxedQty+"</div></th>";
+	    			tr += "<th><div style='width:80px;overflow: hidden;'>"+waitBoxQty+"</div></th>";
     			tr += "</tr>";
     			
     			$("#itemList").append(tr);

wms-operate/src/main/resources/static/ui/views/outstock/boxed/showOutBoxed/main.html

@@ -167,14 +167,15 @@
 			<table  class="table"  style="margin-top: 0px;margin-left:8px;width:734px; height: auto;" rules="all" border="1px" >
 	 			<thead>
 	 				<tr>
-	 					<th colspan="5" style="color: red;font-weight: bold;font-size: 7pt;text-align: left;height:7px;line-height:7px">下架商品的复核装箱情况</th>
+	 					<th colspan="6" style="color: red;font-weight: bold;font-size: 7pt;text-align: left;height:7px;line-height:7px">下架商品的复核装箱情况</th>
 	 				</tr>
 					<tr style="height: 8px;">
-		 				<th><div style="text-align: left;font-size: 8pt;width:150px;height: 8px;line-height: 8px">商品SKU</div></th>
-		 				<th><div style="text-align: left;font-size: 8pt;width: 150px;height: 8px;line-height: 8px">条码</div></th>
-		 				<th><div style="text-align: center;font-size: 8pt;width:100px;height: 8px;line-height: 8px">总数</div></th>
-		 				<th><div style="text-align: center;font-size: 8pt;width:100px;height: 8px;line-height: 8px">已装箱数</div></th>
-		 				<th><div style="text-align: center;font-size: 8pt;width:100px;height: 8px;line-height: 8px">待装箱数</div></th>
+		 				<th><div style="text-align: left;font-size: 8pt;width:120px;height: 8px;line-height: 8px">商品SKU</div></th>
+		 				<th><div style="text-align: left;font-size: 8pt;width: 120px;height: 8px;line-height: 8px">条码</div></th>
+						<th><div style="text-align: left;font-size: 8pt;width: 120px;height: 8px;line-height: 8px">箱号</div></th>
+		 				<th><div style="text-align: center;font-size: 8pt;width:80px;height: 8px;line-height: 8px">总数</div></th>
+		 				<th><div style="text-align: center;font-size: 8pt;width:80px;height: 8px;line-height: 8px">已装箱数</div></th>
+		 				<th><div style="text-align: center;font-size: 8pt;width:80px;height: 8px;line-height: 8px">待装箱数</div></th>
 		 			</tr>
 	 			</thead>
 	 			<tbody id="itemList">

wms-operate/src/main/resources/static/ui/views/outstock/order/printWaybill/default.html

@@ -15,6 +15,7 @@
 	<script type="text/javascript" src="/ui/static/public/js/baiduTemplate.js"></script>
 	<script type="text/javascript" src="/ui/static/public/js/datefmt.js?v=1"></script>
 	<script type="text/javascript" src="/ui/static/public/js/common.js?v=1"></script>
+	<script type="text/javascript" src="/ui/static/3rd/jsbarcode/JsBarcode.all.min.js"></script>
 	<!-- 日期格式化js -->
 	<script type="text/javascript" src="/ui/static/public/js/datefmt.js?v=1"></script>
 	<!-- 进度条 -->
@@ -60,6 +61,34 @@
 
 
 
+		function loadBarcode() {
+			//console.info("loadBarcode...");
+			$(".printCode").each(function () {
+				str = $(this).attr('title');
+				$(this).JsBarcode(str, {
+					width: 1,
+					height: "35mm",
+					format: "code128",
+					displayValue: true,
+					margin: 0
+				});
+			});
+			$(".printCode2").each(function () {
+				str = $(this).attr('title');
+				$(this).JsBarcode(str, {
+					width: 1,
+					height: "30mm",
+					format: "code128",
+					displayValue: true,
+					margin: 0
+				});
+			});
+		}
+		loadBarcode();
+		setTimeout(function () {
+			loadBarcode();
+		}, 500);
+
 		//180秒后自动关闭
 		setTimeout(function () {
 			window.opener = null; window.close();
@@ -87,8 +116,9 @@
 		</table>
 
 		<div style="height:16mm;width:100%; text-align: center; border-bottom:1px solid  #000;">
-			<img  style="margin-top:1mm;" src="data:image/png;base64,<%=data.orderNoBarcodeData%>" />
-			<div style="font-size: 4mm; margin-left: 1mm;margin-top: 0mm;"><%=data.orderNo1%></div>
+<!--			<img  style="margin-top:1mm;" src="data:image/png;base64,<%=data.orderNoBarcodeData%>" />-->
+			<img style="margin-top:1mm;"  class="printCode2"  title="<%=data.orderNo1%>">
+<!--			<div style="font-size: 4mm; margin-left: 1mm;margin-top: 0mm;"><%=data.orderNo1%></div>-->
 		</div>
 
 		<div style="height:22mm;width:100%;border-bottom:1px solid  #000;">
@@ -107,8 +137,9 @@
 		</div>
 
 		<div style="height:17mm;width:100%; text-align: center; border-bottom:1px solid  #000;">
-			<img  style="margin-top:1mm;" src="data:image/png;base64,<%=data.trackingNoBarcodeData%> "/>
-			<div style="font-size: 12px; margin-left: 1mm"><%=data.trackingNo1%></div>
+<!--			<img  style="margin-top:1mm;" src="data:image/png;base64,<%=data.trackingNoBarcodeData%> "/>-->
+			<img style="margin-top:1mm;"  class="printCode"  title="<%=data.trackingNo1%>">
+<!--			<div style="font-size: 12px; margin-left: 1mm"><%=data.trackingNo1%></div>-->
 		</div>
 
 		<div style="height:20mm;width:100%;text-align: left;">

wms-operate/src/main/resources/static/ui/views/outstock/wave/outWaveTask/created.html

@@ -228,8 +228,9 @@
 				<td style="width:165px;">
 					最小数量&nbsp;
 					<select style="width:65px;" id="type1min">
+						<option value='1' selected="selected">1</option>
 						<option value='5'>5</option>
-						<option value='10' selected="selected">10</option>
+						<option value='10'>10</option>
 						<option value='20'>20</option>	
 						<option value='40'>40</option>
 						<option value='100'>100</option>
@@ -260,8 +261,9 @@
 				<td style="width:145px;">
 					最小数量&nbsp;
 					<select style="width:65px;" id="type2min">
+						<option value='1' selected="selected">1</option>
 						<option value='5'>5</option>
-						<option value='10' selected="selected">10</option>
+						<option value='10'>10</option>
 						<option value='20'>20</option>	
 						<option value='40'>40</option>
 						<option value='100'>100</option>
@@ -291,8 +293,9 @@
 				<td style="width:145px;">
 					最小数量&nbsp;
 					<select style="width:65px;" id="type3min">
+						<option value='1' selected="selected">1</option>
 						<option value='5'>5</option>
-						<option value='10' selected="selected">10</option>
+						<option value='10'>10</option>
 						<option value='15'>15</option>
 						<option value='20'>20</option>	
 						<option value='40'>40</option>
@@ -333,11 +336,11 @@
 				<td style="width:145px;">
 					最小数量&nbsp;
 					<select style="width:65px;" id="type4min">	
-							<option value="1">1</option>
+							<option value="1"  selected="selected">1</option>
 							<option value="5" >5</option>
 							<option value="10">10</option>
 							<option value="18">18</option>
-							<option value="20" selected="selected">20</option>
+							<option value="20">20</option>
 					</select>
 				</td>
 				<td>