货品，二维码，入库，台账jsp调整

src/main/webapp/webpage/modules/warehouse/goods/goodsForm.jsp

@@ -91,16 +91,16 @@
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="col-sm-2 control-label">备注信息：</label>
+					<label class="col-sm-2 control-label"><font color="red">*</font>操作人：</label>
 					<div class="col-sm-10">
-						<form:textarea path="remarks" htmlEscape="false" rows="4"    class="form-control "/>
+						<sys:userselect id="operator" name="operator.id" value="${goods.operator.id}" labelName="operator.name" labelValue="${goods.operator.name}"
+							    cssClass="form-control required"/>
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="col-sm-2 control-label"><font color="red">*</font>操作人：</label>
+					<label class="col-sm-2 control-label">备注信息：</label>
 					<div class="col-sm-10">
-						<sys:userselect id="operator" name="operator.id" value="${goods.operator.id}" labelName="operator.name" labelValue="${goods.operator.name}"
-							    cssClass="form-control required"/>
+						<form:textarea path="remarks" htmlEscape="false" rows="4"    class="form-control "/>
 					</div>
 				</div>
 		<div class="tabs-container">
@@ -120,7 +120,6 @@
 						<th>型号</th>
 						<th>数量</th>
 						<th>备注信息</th>
-						<th>入库状态</th>
 						<th width="10">&nbsp;</th>
 					</tr>
 				</thead>
@@ -159,16 +158,6 @@
 						<textarea id="goodsInfoList{{idx}}_remarks" name="goodsInfoList[{{idx}}].remarks" rows="4"    class="form-control ">{{row.remarks}}</textarea>
 					</td>
 					
-					
-					<td>
-						<select id="goodsInfoList{{idx}}_state" name="goodsInfoList[{{idx}}].state" data-value="{{row.state}}" class="form-control m-b  ">
-							<option value=""></option>
-							<c:forEach items="${fns:getDictList('wh_stockroom_state')}" var="dict">
-								<option value="${dict.value}">${dict.label}</option>
-							</c:forEach>
-						</select>
-					</td>
-					
 					<td class="text-center" width="10">
 						{{#delBtn}}<span class="close" onclick="delRow(this, '#goodsInfoList{{idx}}')" title="删除">&times;</span>{{/delBtn}}
 					</td>

src/main/webapp/webpage/modules/warehouse/goods/goodsList.js

@@ -288,6 +288,18 @@ $(document).ready(function() {
 			idx: idx, delBtn: true, row: row
 		}));
 	}
+
+	function printQr(id) {
+  		jp.get("${ctx}/warehouse/goods/goods/printQr?goodsInfoId="+id, function (r) {
+			console.log(r)
+		})
+	}
+
+	function cleanQr(id) {
+		jp.get("${ctx}/warehouse/goods/goods/cleanQr?goodsInfoId="+id, function (r) {
+			console.log(r)
+		})
+	}
 			
 </script>
 <script type="text/template" id="goodsChildrenTpl">//<!--
@@ -302,11 +314,11 @@ $(document).ready(function() {
 							<tr>
 								<th>名称</th>
 								<th>类型</th>
+								<th>类型编码</th>
 								<th>型号</th>
 								<th>数量</th>
 								<th>备注信息</th>
-								<th>入库状态</th>
-								<th>主表ID</th>
+								<th>操作</th>
 							</tr>
 						</thead>
 						<tbody id="goodsChild-{{idx}}-1-List">
@@ -321,6 +333,9 @@ $(document).ready(function() {
 						{{row.name}}
 					</td>
 					<td>
+						{{row.type.name}}
+					</td>
+					<td>
 						{{row.type.code}}
 					</td>
 					<td>
@@ -333,10 +348,12 @@ $(document).ready(function() {
 						{{row.remarks}}
 					</td>
 					<td>
-						{{row.dict.state}}
-					</td>
-					<td>
-						{{row.goods.id}}
+						<button onclick="printQr('{{row.id}}')">
+							打印二维码
+						</button>
+						<button onclick="cleanQr('{{row.id}}')">
+							清除二维码
+						</button>
 					</td>
 				</tr>//-->
 	</script>

src/main/webapp/webpage/modules/warehouse/storage/storageList.js

@@ -310,8 +310,8 @@ $(document).ready(function() {
 								<th>名称</th>
 								<th>类型</th>
 								<th>型号</th>
-								<th>货品明细id</th>
-								<th>货架id</th>
+								<th>数量</th>
+								<th>货架</th>
 								<th>备注信息</th>
 							</tr>
 						</thead>
@@ -336,10 +336,10 @@ $(document).ready(function() {
 						{{row.model}}
 					</td>
 					<td>
-						{{row.goodsInfo.id}}
+
 					</td>
 					<td>
-						{{row.shelves.name}}
+						{{row.names}}
 					</td>
 					<td>
 						{{row.remarks}}