封装入库组盘参数

tongzhonghao
1 parent cb38ccdc
Showing 4 changed files with 155 additions and 42 deletions
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/domain/BatteryBean.java
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderService.java
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
src/main/resources/templates/receipt/receiving/receiving.html
+package com.huaheng.pc.receipt.receiptContainerHeader.domain;
+
+import java.math.BigDecimal;
+
+public class BatteryBean {
+
+    private BigDecimal electricQuantity;
+    private String batteryTypes;
+    private String completeness;
+    private String storageType;
+    private String type;
+    private BigDecimal materialTareWeight;
+    private BigDecimal materialNetWeight;
+    private BigDecimal materialGrossWeight;
+    private String countryCode;
+    private String remark;
+    private String recycler;
+    private BigDecimal batteryQty;
+
+    public BigDecimal getBatteryQty() {
+        return batteryQty;
+    }
+
+    public void setBatteryQty(BigDecimal batteryQty) {
+        this.batteryQty = batteryQty;
+    }
+
+    public String getCountryCode() {
+        return countryCode;
+    }
+
+    public void setCountryCode(String countryCode) {
+        this.countryCode = countryCode;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public BigDecimal getElectricQuantity() {
+        return electricQuantity;
+    }
+
+    public void setElectricQuantity(BigDecimal electricQuantity) {
+        this.electricQuantity = electricQuantity;
+    }
+
+    public String getBatteryTypes() {
+        return batteryTypes;
+    }
+
+    public void setBatteryTypes(String batteryTypes) {
+        this.batteryTypes = batteryTypes;
+    }
+
+    public String getCompleteness() {
+        return completeness;
+    }
+
+    public void setCompleteness(String completeness) {
+        this.completeness = completeness;
+    }
+
+    public String getStorageType() {
+        return storageType;
+    }
+
+    public void setStorageType(String storageType) {
+        this.storageType = storageType;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public BigDecimal getMaterialTareWeight() {
+        return materialTareWeight;
+    }
+
+    public void setMaterialTareWeight(BigDecimal materialTareWeight) {
+        this.materialTareWeight = materialTareWeight;
+    }
+
+    public BigDecimal getMaterialNetWeight() {
+        return materialNetWeight;
+    }
+
+    public void setMaterialNetWeight(BigDecimal materialNetWeight) {
+        this.materialNetWeight = materialNetWeight;
+    }
+
+    public BigDecimal getMaterialGrossWeight() {
+        return materialGrossWeight;
+    }
+
+    public void setMaterialGrossWeight(BigDecimal materialGrossWeight) {
+        this.materialGrossWeight = materialGrossWeight;
+    }
+
+    public String getRecycler() {
+        return recycler;
+    }
+
+    public void setRecycler(String recycler) {
+        this.recycler = recycler;
+    }
+}
@@ -3,6 +3,7 @@ package com.huaheng.pc.receipt.receiptContainerHeader.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.mobile.receipt.ReceiptBill;
+import com.huaheng.pc.receipt.receiptContainerHeader.domain.BatteryBean;
 import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
 import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerView;
 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
@@ -42,8 +43,8 @@ public interface ReceiptContainerHeaderService extends IService&lt;ReceiptContainer
     AjaxResult saveContainer(String receiptCode, String containerCode, Integer receiptDetailId,
                              BigDecimal batteryPackageWeight,
                              String locationCode, BigDecimal qty, String locatingRule,
-                             String barCodeHeaderCode,String area,String barCodeHeaderId,
-                             ReceiptDetail receiptDetail);
+                             String barCodeHeaderCode, String area, String barCodeHeaderId,
+                             BatteryBean batteryBean);
     /**
      * 取消组盘
@@ -33,6 +33,7 @@ import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
 import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
 import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
+import com.huaheng.pc.receipt.receiptContainerHeader.domain.BatteryBean;
 import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
 import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerView;
 import com.huaheng.pc.receipt.receiptContainerHeader.mapper.ReceiptContainerHeaderMapper;
@@ -129,10 +130,10 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
             Integer receiptDetailId,
             BigDecimal batteryPackageWeight, String locationCode, BigDecimal qty,
             String locatingRule, String barCodeHeaderCode,
-            String area,String barCodeHeaderId,ReceiptDetail receiptdetail) {
+            String area,String barCodeHeaderId,BatteryBean batteryBean) {
         ReceiptDetail detail = receiptDetailService.getById(receiptDetailId);
-        detail.setType(receiptdetail.getType());
-        detail.setStorageType(receiptdetail.getStorageType());
+        detail.setType(batteryBean.getType());
+        detail.setStorageType(batteryBean.getStorageType());
         receiptDetailService.updateById(detail);
         //超收检查
@@ -141,7 +142,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
             //检查电池类必填项
             if(detail.getMaterialIsBattery()==1){
                 // 检查电池类必填项和保存入库详情
-                checkBatteryDataSaveReceipt(receiptdetail,qty,detail);
+                checkBatteryDataSaveReceipt(batteryBean,qty,detail);
             }
         }else{
@@ -273,7 +274,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
             //组盘详情
             //更新入库单详情数据
             receiptContainerDetailAdd(receiptContainerHeaders.get(0), receiptDetail, qty,  batteryPackageWeight,
-                    containerCode, locationCode,barCodeHeaderCode,barCodeDetails,receiptdetail);
+                    containerCode, locationCode,barCodeHeaderCode,barCodeDetails,batteryBean);
             //更新入库header表状态，保存主条码
             receiptDetailService.updateReceiptHeaderLastStatusByReceiptHeaderId(receiptDetail.getReceiptId(),
                     barCodeHeaderCode,barCodeHeader.getProType());
@@ -293,7 +294,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
             //更新入库单详情数据
             receiptContainerDetailAdd(receiptContainerHeaders.get(0), receiptDetail,
                     qty,batteryPackageWeight,  containerCode,
-                    locationCode,barCodeHeaderCode,null,receiptdetail);
+                    locationCode,barCodeHeaderCode,null,batteryBean);
             //如果单据数量等于已收数量，更新入库详情状态和入库单状态
             if (receiptDetail.getTotalQty().compareTo(receiptDetail.getOpenQty()) == 0){
                 if (StringUtils.isNotEmpty(locationCode)){
@@ -314,18 +315,19 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         }
         return AjaxResult.success("success");
     }
-    public void checkBatteryDataSaveReceipt(ReceiptDetail receiptdetail,BigDecimal qty,ReceiptDetail receiptdetail1){
-        BigDecimal batteryQty=receiptdetail.getBatteryQty();
-        String batteryPackType=receiptdetail.getBatteryPackType();
-        String batteryTypes=receiptdetail.getBatteryTypes();
-        String completeness=receiptdetail.getCompleteness();
-        BigDecimal materialTareWeight=receiptdetail.getMaterialTareWeight();
-        BigDecimal materialGrossWeight=receiptdetail.getMaterialGrossWeight();
-        BigDecimal materialNetWeight=receiptdetail.getMaterialNetWeight();
-        BigDecimal electricQuantity=receiptdetail.getElectricQuantity();
-        String recycler=receiptdetail.getRecycler();
-        if(StringUtils.isEmpty(batteryPackType)
-                ||StringUtils.isEmpty(batteryTypes)
+    public void checkBatteryDataSaveReceipt(BatteryBean batteryBean,BigDecimal qty,ReceiptDetail receiptdetail1){
+        BigDecimal batteryQty=batteryBean.getBatteryQty();
+//        String batteryPackType=batteryBean.getBatteryPackType();
+        String batteryTypes=batteryBean.getBatteryTypes();
+        String completeness=batteryBean.getCompleteness();
+        BigDecimal materialTareWeight=batteryBean.getMaterialTareWeight();
+        BigDecimal materialGrossWeight=batteryBean.getMaterialGrossWeight();
+        BigDecimal materialNetWeight=batteryBean.getMaterialNetWeight();
+        BigDecimal electricQuantity=batteryBean.getElectricQuantity();
+        String recycler=batteryBean.getRecycler();
+        if(
+//                StringUtils.isEmpty(batteryPackType)||
+                StringUtils.isEmpty(batteryTypes)
                 ||StringUtils.isEmpty(completeness)
                 ||StringUtils.isEmpty(recycler)
                 ||null==electricQuantity
@@ -341,7 +343,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         //保存进入库表
         ReceiptDetail receiptDetailsave =receiptdetail1;
         receiptDetailsave.setBatteryTypes(batteryTypes);
-        receiptDetailsave.setBatteryPackType(batteryPackType);
+//        receiptDetailsave.setBatteryPackType(batteryPackType);
         receiptDetailsave.setCompleteness(completeness);
         receiptDetailsave.setRecycler(recycler);
         receiptDetailsave.setElectricQuantity(electricQuantity);
@@ -349,8 +351,8 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         receiptDetailsave.setMaterialGrossWeight(materialGrossWeight);
         receiptDetailsave.setMaterialNetWeight(materialNetWeight);
         receiptDetailsave.setMaterialTareWeight(materialTareWeight);
-        receiptDetailsave.setType(receiptdetail.getType());
-        receiptDetailsave.setStorageType(receiptdetail.getStorageType());
+        receiptDetailsave.setType(batteryBean.getType());
+        receiptDetailsave.setStorageType(batteryBean.getStorageType());
         //电池类才生成电池包二维码
         String batteryPackTwoCode=findBatteryPackTwoCode(receiptDetailsave);
         receiptDetailsave.setBatteryPackTwoCode(batteryPackTwoCode);
@@ -836,7 +838,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
     @Transactional
     public AjaxResult receiptContainerDetailAdd(ReceiptContainerHeader receiptContainerHeader, ReceiptDetail receiptDetail, BigDecimal qty,
     BigDecimal batteryPackageWeight ,String containerCode,String locationCode,
-    String barCodeHeaderCode,List<BarCodeDetail> barCodeDetails,ReceiptDetail receiptdetail){
+    String barCodeHeaderCode,List<BarCodeDetail> barCodeDetails,BatteryBean batteryBean){
         int receiptContainerHeaderId = receiptContainerHeader.getId();
         LambdaQueryWrapper<ReceiptContainerDetail> lambda = Wrappers.lambdaQuery();
@@ -871,13 +873,13 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
                     String materialCode=receiptDetail1.getMaterialCode();
                     BigDecimal barcodeqty=receiptDetail1.getOpenQty();
                     AjaxResult result=savereceiptContainerDetail(receiptContainerDetail,receiptHeader,receiptDetail1,
-                            locationCode,container,receiptContainerHeader,receiptDetail1.getOpenQty(),barCodeHeaderCode,receiptdetail);
+                            locationCode,container,receiptContainerHeader,receiptDetail1.getOpenQty(),barCodeHeaderCode,batteryBean);
                 }
                 return AjaxResult.success("保存入库组盘详情成功");
             }else{
                 String materialCode=receiptDetail.getMaterialCode();
                 AjaxResult result=savereceiptContainerDetail(receiptContainerDetail,receiptHeader,receiptDetail,
-                        locationCode,container,receiptContainerHeader,qty,barCodeHeaderCode,receiptdetail);
+                        locationCode,container,receiptContainerHeader,qty,barCodeHeaderCode,batteryBean);
                 return result;
             }
         //receiptContainerDetail 不等于空的话
@@ -912,7 +914,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
                                            //Integer receiptContainerHeaderId,
                                             String locationCode,Container container,
                                            ReceiptContainerHeader receiptContainerHeader,
-                                           BigDecimal qty,String barCodeHeaderCode,ReceiptDetail receiptdetail){
+                                           BigDecimal qty,String barCodeHeaderCode,BatteryBean batteryBean){
         receiptContainerDetail.setQty(qty);
         receiptContainerDetail.setReceiptContainerId(receiptContainerHeader.getId());
@@ -961,8 +963,8 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         receiptContainerDetail.setMaterialNetWeight(receiptDetail.getMaterialNetWeight());
         receiptContainerDetail.setMaterialTareWeight(receiptDetail.getMaterialTareWeight());
         receiptContainerDetail.setRecycler(receiptDetail.getRecycler());
-        receiptContainerDetail.setCountryCode(receiptdetail.getCountryCode());
-        receiptContainerDetail.setRemark(receiptdetail.getRemark());
+        receiptContainerDetail.setCountryCode(batteryBean.getCountryCode());
+        receiptContainerDetail.setRemark(batteryBean.getRemark());
         if (!receiptContainerDetailService.save(receiptContainerDetail)){
             return AjaxResult.error("保存入库组盘详情失败");
@@ -115,7 +115,7 @@
 				<div id="batteryHidden" hidden>
 					<li ><span class="selectClass">电池包类型:</span>
 						<select id="batteryPackType" name="batteryPackType" class="form-control" th:with="batteryPackType=${@dict.getType('batteryPackType')}" placeholder="电池类必填">
-							<option value="">电池包类型</option>
+							<option value="">--请选择--</option>
 							<option th:each="dict : ${batteryPackType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
 						</select>
 						<!--电池包类型：<input type="text" id="batteryPackType" placeholder="电池类必填"/></li>-->
@@ -123,7 +123,8 @@
 					<li >
 						<span class="selectClass">电池类型:</span>
 						<select id="batteryTypes" name="batteryTypes" class="form-control"  placeholder="电池类必填">
-							<option value="">电池类型</option>
+							<option value="">--请选择--</option>
+							<option value="1">电池包</option>
 							<option value="2">电池模块</option>
 							<option value="3">电池单体</option>
 						</select>
@@ -131,14 +132,14 @@
 					<li >
 						<span class="selectClass">完整程度:</span>
 						<select id="completeness" name="completeness" class="form-control" th:with="completeness=${@dict.getType('completeness')}">
-							<option value="">完整程度</option>
+							<option value="">--请选择--</option>
 							<option th:each="dict : ${completeness}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
 						</select>
 					</li>
 					<li >
 						<span class="selectClass">利用类型:</span>
 						<select id="storageType" name="storageType" class="form-control" placeholder="电池类必填">
-							<option value="">利用类型</option>
+							<option value="">--请选择--</option>
 							<option value="0">再生利用</option>
 							<option value="1">梯次利用</option>
 						</select>
@@ -146,14 +147,14 @@
 					<li >
 						<span class="selectClass">再生利用类型:</span>
 						<select id="type" name="type" class="form-control" placeholder="电池类必填">
-							<option value="">再生利用类型</option>
+							<option value="">--请选择--</option>
 							<option value="1">废旧动力蓄电池</option>
 							<option value="2">次品动力蓄电池</option>
 							<option value="3">其他领域废旧电池</option>
 						</select>
 					</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>
+					<li>回收人：<select type="text" style="width: 80px" id="recycler"  th:with="completeness=${@UserServiceImpl.getRecover()}">
+						<option th:each="dict : ${completeness}" th:text="${dict.userName}" th:value="${dict.userName}"></option>
 					</select></li>
 					<li>电量：<input type="text"  id="electricQuantity" placeholder="电池类必填"/></li>
 					<li>皮重：<input type="text"  id="materialTareWeight"/><button class="btn btn-sm btn-success" onclick="getWeight()">取重</button></li>
@@ -433,12 +434,6 @@
 					$("#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);
 				}
 			})