组盘调整

tongzhonghao
1 parent 8aa808aa
Showing 4 changed files with 24 additions and 3 deletions
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java
src/main/resources/mybatis/receipt/ReceiptDetailMapper.xml
src/main/resources/templates/receipt/receiving/receiving.html
@@ -133,7 +133,9 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
             String batteryPackType,String batteryTypes,
             String completeness*/) {
         ReceiptDetail detail = receiptDetailService.getById(receiptDetailId);
-
+        detail.setType(receiptdetail.getType());
+        detail.setStorageType(receiptdetail.getStorageType());
+        receiptDetailService.updateById(detail);
  
         //超收检查
         if(StringUtils.isEmpty(barCodeHeaderCode)){
@@ -264,6 +264,7 @@ public class ReceivingController extends BaseController {
         Map map=new ModelMap();
         map.put("inventoryList",inventoryList);
         map.put("containerList",emptyContainerList);
+        map.put("curBill",receiptDetail);
         return AjaxResult.success(map);
     }
     //跳到选择主条码页面
@@ -91,6 +91,8 @@
       <result column="barcodeDetailsId" jdbcType="INTEGER" property="barcodeDetailsId" />
       <result column="barcodeDetailsCode" jdbcType="VARCHAR" property="barcodeDetailsCode" />
       <result column="materialIsBattery" jdbcType="INTEGER" property="materialIsBattery" />
+      <result column="type" jdbcType="INTEGER" property="type" />
+      <result column="storageType" jdbcType="INTEGER" property="storageType" />
  
   </resultMap>
   <sql id="Base_Column_List">
@@ -105,7 +107,7 @@
     itemNetPrice, isVirtualBom, created, createdBy, lastUpdated, lastUpdatedBy,totalWeight,openWeight,
     version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,electricQuantity,
     batteryPackTwoCode,recoveryDate,recycler,manufactureData,manufacturerOneCode,manufacturerTwoCode,batteryPackType,completeness,storageShelf,
-    processStamp, deleted,statusFlowCode,grossWeight,tareWeight,materialBatch,receiptWarehouse,materialNetWeight,materialTareWeight,materialGrossWeight
+    processStamp, deleted,statusFlowCode,grossWeight,tareWeight,materialBatch,receiptWarehouse,materialNetWeight,materialTareWeight,materialGrossWeight,storageType,`type`
   </sql>
  
   <select id="getReceiptQtyLast7Days" resultType="com.huaheng.pc.task.taskDetail.domain.TaskDetail">
@@ -106,6 +106,7 @@
 					<li>
 						<select id="batteryTypes" name="batteryTypes" class="form-control"  placeholder="电池类必填">
 							<option value="">电池类型</option>
+							<option value="1">电池包</option>
 							<option value="2">电池模块</option>
 							<option value="3">电池单体</option>
 						</select>
@@ -136,7 +137,9 @@
 					<li>皮重：<input type="text" style="width: 60px" id="materialTareWeight"/><button class="btn btn-sm btn-success" onclick="getWeight()">取重</button></li>
 					<li>毛重：<input type="text" style="width: 60px" id="materialGrossWeight"/><button class="btn btn-sm btn-success" onclick="getWeight()">取重</button></li>
 					<li>净重：<input type="text" style="width: 60px" id="materialNetWeight"/></li>
-					<li>回收人：<input type="text" style="width: 80px" id="recycler"/></li>
+					<li>回收人：<select type="text" style="width: 80px" id="recycler"  th:with="completeness=${@dict.getType('completeness')}">
+						<option th:each="dict : ${completeness}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
+					</select></li>
 					<li>国家编码：<input type="text" id="countryCode" placeholder="国家编码"/></li>
 					<!--<div class="form-group" style="width:300px;white-space: nowrap">
 						<img id="camera" name="camera" src="" width="300px" height="200px"/>
@@ -404,6 +407,15 @@
 				success:res=>{
 					// $("#bootstrap-table1").bootstrapTable('load',res.data.list);
 					$("#bootstrap-table2").bootstrapTable('load',res.data.inventoryList);
+					$("#storageType").val(res.data.curBill.storageType)
+					$("#type").val(res.data.curBill.type)
+					$("#batteryTypes").val(res.data.curBill.batteryTypes)
+					$("#completeness").val(res.data.curBill.completeness)
+					$("#materialNetWeight").val(res.data.curBill.materialNetWeight)
+					$("#materialTareWeight").val(res.data.curBill.materialTareWeight)
+					$("#materialGrossWeight").val(res.data.curBill.materialGrossWeight)
+					$("#electricQuantity").val(res.data.curBill.electricQuantity)
+					$("#electricQuantity").val(res.data.curBill.electricQuantity)
 					// $("#bootstrap-table3").bootstrapTable('load',res.data.containerList);
 				}
 			})
@@ -868,6 +880,8 @@
 		let batteryTypes = $("#batteryTypes").val();
 		let completeness = $("#completeness").val();
 		let electricQuantity = $("#electricQuantity").val();
+		let storageType = $("#storageType").val();
+		let type = $("#type").val();
 		let area = $("#area").val();
  
 		let materialTareWeight = $("#materialTareWeight").val();
@@ -901,6 +915,8 @@
 				materialGrossWeight:materialGrossWeight,
 				materialNetWeight:materialNetWeight,
 				recycler:recycler,
+				storageType:storageType,
+				type:type,
 				area:area
 			},
 			success:function (data) {