diff --git a/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java b/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
index 9763a44..f425d1e 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
@@ -110,14 +110,11 @@ public class ReceiptDetailController extends BaseController {
/**
* 新增入库明细
*/
- @GetMapping("/add/{id}/{receiptCode}/{receiptType}/{grossWeight}/{tareWeight}/{netWeight}/{materialBatch}")
+ @GetMapping("/add/{id}/{receiptCode}/{receiptType}/{supplierCode}")
public String add(@PathVariable("id") Integer id,
@PathVariable("receiptCode") String receiptCode,
@PathVariable("receiptType") String receiptType,
- @PathVariable("grossWeight") BigDecimal grossWeight,
- @PathVariable("tareWeight") BigDecimal tareWeight,
- @PathVariable("netWeight") BigDecimal netWeight,
- @PathVariable("materialBatch") String materialBatch,
+ @PathVariable("supplierCode") String supplierCode,
ModelMap mmap) {
LambdaQueryWrapper<ReceiptHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
lambdaQueryWrapper.eq(ReceiptHeader::getId, id).eq(ReceiptHeader::getCode, receiptCode);
@@ -126,10 +123,7 @@ public class ReceiptDetailController extends BaseController {
mmap.put("companyCode", receiptHeader.getCompanyCode());
mmap.put("receiptCode", receiptCode);
mmap.put("receiptType", receiptType);
- mmap.put("grossWeight", grossWeight);
- mmap.put("tareWeight", tareWeight);
- mmap.put("netWeight", netWeight);
- mmap.put("materialBatch", materialBatch);
+ mmap.put("supplierCode", supplierCode);
return prefix + "/add";
}
@@ -385,4 +379,31 @@ public class ReceiptDetailController extends BaseController {
return AjaxResult.success("绑定车辆信息成功，"+var+"条记录绑定成功！！");
}
+ @PostMapping("/unbindCar/{ids}")
+ @ResponseBody
+ public AjaxResult unbindCar(@PathVariable("ids")String ids) throws Exception {
+ if (StringUtils.isEmpty(ids)){
+ return AjaxResult.error("id为空");
+ }
+ int var = 0;
+ for (Integer id : Convert.toIntArray(ids)){
+ ReceiptDetail detail = receiptDetailService.getById(id);
+ if(detail == null){
+ continue;
+ }
+ detail.setMaterialBatch("");
+ detail.setGrossWeight(BigDecimal.ZERO);
+ detail.setNetWeight(BigDecimal.ZERO);
+ detail.setTareWeight(BigDecimal.ZERO);
+ boolean flag = receiptDetailService.updateById(detail);
+ if(flag){
+ var++;
+ }
+ }
+ if(var == 0){
+ return AjaxResult.error("绑定车辆失败请重新绑定");
+ }
+ return AjaxResult.success("绑定车辆信息成功，"+var+"条记录绑定成功！！");
+ }
+
}
diff --git a/src/main/resources/templates/receipt/receiptDetail/add.html b/src/main/resources/templates/receipt/receiptDetail/add.html
index c6479d0..69fd181 100644
--- a/src/main/resources/templates/receipt/receiptDetail/add.html
+++ b/src/main/resources/templates/receipt/receiptDetail/add.html
@@ -13,6 +13,7 @@
<div class="col-sm-8">
<input id="receiptId" name="receiptId" class="form-control" type="text" th:value="${receiptId}" readonly="readonly" >
<input id="companyCode" name="companyCode" type="hidden" th:value="${companyCode}" >
+ <input id="supplierCode" name="supplierCode" type="hidden" th:value="${supplierCode}" >
</div>
</div>
<div class="form-group">
@@ -40,72 +41,6 @@
<input id="totalQty" name="totalQty" class="form-control" value="1" type="text" >
</div>
</div>
-<!-- <div class="form-group">-->
-<!-- <label class="col-sm-3 control-label">电池包重量：</label>-->
-<!-- <div class="col-sm-8">-->
-<!-- <input id="batteryPackageWeight" name="batteryPackageWeight" class="form-control" type="text">-->
-<!-- </div>-->
-<!-- </div>-->
- <div class="form-group">
- <label class="col-sm-3 control-label">电池包电量：</label>
- <div class="col-sm-8">
- <input id="electricQuantity" name="electricQuantity" class="form-control" type="text">
- </div>
- </div>
-<!-- <div class="form-group">-->
-<!-- <div class="form-control-static col-sm-offset-9" style="margin-left: 205px">-->
-<!-- <button onclick="chooseVehicle()" class="btn btn-primary" type="button">选择车辆入库信息</button>-->
-<!-- </div>-->
-<!-- </div>-->
- <div class="form-group" style="display: none;">
- <label class="col-sm-3 control-label">原料批号：</label>
- <div class="col-sm-8">
- <input id="materialBatch" name="materialBatch" th:value="${materialBatch}" class="form-control" type="hidden" readonly="readonly" >
- </div>
- </div>
- <div class="form-group" style="display: none;">
- <label class="col-sm-3 control-label">车辆毛重：</label>
- <div class="col-sm-8">
- <input id="grossWeight" name="grossWeight" th:value="${grossWeight}" class="form-control" type="hidden" readonly="readonly">
- </div>
- </div>
- <div class="form-group" style="display: none;">
- <label class="col-sm-3 control-label">车辆皮重：</label>
- <div class="col-sm-8">
- <input id="tareWeight" name="tareWeight" th:value="${tareWeight}" class="form-control" type="hidden" readonly="readonly">
- </div>
- </div>
- <div class="form-group" style="display: none;">
- <label class="col-sm-3 control-label">车辆净重：</label>
- <div class="col-sm-8">
- <input id="netWeight" name="netWeight" th:value="${netWeight}" class="form-control" type="hidden" readonly="readonly">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">物料净重：</label>
- <div class="col-sm-8">
- <input id="materialNetWeight" name="materialNetWeight" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">物料毛重：</label>
- <div class="col-sm-8">
- <input id="materialGrossWeight" name="materialGrossWeight" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">物料皮重：</label>
- <div class="col-sm-8">
- <input id="materialTareWeight" name="materialTareWeight" class="form-control" type="text">
- </div>
- </div>
-
- <!--<div class="form-group">-->
- <!--<label class="col-sm-3 control-label">供应商编码：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input id="supplierCode" name="supplierCode" class="form-control" type="text">-->
- <!--</div>-->
- <!--</div>-->
<div class="form-group">
<label class="col-sm-3 control-label">订单号 ：</label>
<div class="col-sm-8">
@@ -118,190 +53,9 @@
<input id="batch" name="batch" class="form-control" type="text">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">单位1：</label>
- <div class="col-sm-8">
- <input id="unitId1" name="unitId1" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">单位2：</label>
- <div class="col-sm-8">
- <input id="unitId2" name="unitId2" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">1->2转换倍数：</label>
- <div class="col-sm-8">
- <input id="multiple" name="multiple" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">单位1对应数量：</label>
- <div class="col-sm-8">
- <input id="unitId1Qty" name="unitId1Qty" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">单位2对应数量：</label>
- <div class="col-sm-8">
- <input id="unitId2Qty" name="unitId2Qty" class="form-control" type="text">
- </div>
- </div>
-
- <!--<div class="form-group">
- <label class="col-sm-3 control-label">来源企业名称：</label>
- <div class="col-sm-8">
- <input id="sourceEnterpriseName" name="sourceEnterpriseName" class="form-control" type="text">
- </div>
- </div>-->
- <!--<div class="form-group">
- <label class="col-sm-3 control-label">来源企业名称统一社会信用代码：</label>
- <div class="col-sm-8">
- <input id="sourceEnterpriseCode" name="sourceEnterpriseCode" class="form-control" type="text">
- </div>
- </div>-->
- <!--<div class="form-group">
- <label class="col-sm-3 control-label">电池质量（kg）：</label>
- <div class="col-sm-8">
- <input id="batteryQuality" name="batteryQuality" class="form-control" type="text">
- </div>
- </div>-->
- <div class="form-group">
- <label class="col-sm-3 control-label">电池产品类型：</label>
- <div class="col-sm-8">
- <select id="batteryType" name="batteryType" class="form-control" type="text">
- <option value="1">电池包</option>
- <option value="2">电池模块</option>
- <option value="3">电池单体</option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">电池编码：</label>
- <div class="col-sm-8">
- <input id="batteryCode" name="batteryCode" class="form-control" type="text">
- </div>
- </div>
-
- <!--<div class="form-group">
- <label class="col-sm-3 control-label">电池包二维码：</label>
- <div class="col-sm-8">
- <input id="batteryPackTwoCode" name="batteryPackTwoCode" class="form-control" type="text">
- </div>
- </div>-->
- <div class="form-group">
- <label class="col-sm-3 control-label">回收日期：</label>
- <div class="col-sm-8">
- <input id="recoveryDate" name="recoveryDate" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">回收人：</label>
- <div class="col-sm-8">
- <input id="recycler" name="recycler" class="form-control" type="text">
- </div>
- </div>
-<!-- <div class="form-group">-->
-<!-- <label class="col-sm-3 control-label">生产日期：</label>-->
-<!-- <div class="col-sm-8">-->
-<!-- <input id="manufactureData" name="manufactureData" class="form-control" type="text">-->
-<!-- </div>-->
-<!-- </div>-->
- <div class="form-group">
- <label class="col-sm-3 control-label">厂家编码1：</label>
- <div class="col-sm-8">
- <input id="manufacturerOneCode" name="manufacturerOneCode" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">厂家编码2：</label>
- <div class="col-sm-8">
- <input id="manufacturerTwoCode" name="manufacturerTwoCode" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">电池包种类：</label>
- <div class="col-sm-8">
- <!--<input id="batteryPackType" name="batteryPackType" class="form-control" type="text">
- -->
- <select id="batteryPackType" name="batteryPackType" class="form-control" th:with="batteryPackType=${@dict.getType('batteryPackType')}">
- <option value="">请选择</option>
- <option th:each="dict : ${batteryPackType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">完整程度：</label>
- <div class="col-sm-8">
- <select id="completeness" name="completeness" class="form-control" th:with="completeness=${@dict.getType('completeness')}">
- <option value="">请选择</option>
- <option th:each="dict : ${completeness}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">入库货架：</label>
- <div class="col-sm-8">
- <input id="storageShelf" name="storageShelf" class="form-control" type="text">
- </div>
- </div>
<div class="form-group">
- <label class="col-sm-3 control-label">入库仓库：</label>
- <div class="col-sm-8">
- <input id="receiptWarehouse" name="receiptWarehouse" class="form-control" type="text">
- </div>
- </div>
-
-
- <div class="form-group">
- <label class="col-sm-3 control-label">国家编码：</label>
- <div class="col-sm-8">
- <input id="countryCode" name="countryCode" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">电池类型：</label>
- <div class="col-sm-8">
- <select id="batteryTypes" name="batteryTypes" class="form-control" th:with="batteryType=${@dict.getType('batteryType')}">
- <option value="">请选择</option>
- <option th:each="dict : ${batteryType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
- </select>
- </div>
- </div>
- <!--<div class="form-group">
- <label class="col-sm-3 control-label">入库时间：</label>
- <div class="col-sm-8">
- <input id="receiptDate" name="receiptDate" class="form-control" type="text">
- </div>
- </div>-->
- <!--<div class="form-group">
- <label class="col-sm-3 control-label">入库质量（kg）：</label>
- <div class="col-sm-8">
- <input id="receiptWeight" name="receiptWeight" class="form-control" type="text">
- </div>
- </div>-->
- <!--<div class="form-group">
- <label class="col-sm-3 control-label">电池个数：</label>
- <div class="col-sm-8">
- <input id="batteryQty" name="batteryQty" class="form-control" type="text">
- </div>
- </div>-->
- <!--<div class="form-group">
- <label class="col-sm-3 control-label">旧电池来源：</label>
- <div class="col-sm-8">
- <input id="oldBatterySource" name="oldBatterySource" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">统一社会信用代码：</label>
- <div class="col-sm-8">
- <input id="allCreditCode" name="allCreditCode" class="form-control" type="text">
- </div>
- </div>-->
- <div class="form-group">
<label class="col-sm-3 control-label">批号：</label>
<div class="col-sm-8">
<input id="lot" name="lot" class="form-control" type="text">
@@ -388,18 +142,6 @@
receiptType:{
required:true
},
- grossWeight:{
- required:true
- },
- tareWeight:{
- required:true
- },
- netWeight:{
- required:true
- },
- materialBatch:{
- required:true
- },
materialCode:{
required:true
},
@@ -465,11 +207,6 @@
});
});
- function chooseVehicle(){
- var url = ctx + "vehicle/vehicleReceipt/listVehicleReceipt";
- $.modal.open("选择车辆入库信息", url);
- }
-
$("#dateTime").datetimepicker({
language: 'zh-CN',//语言
format: 'yyyy-mm-dd hh:ii:ss', //String 默认值: 'mm/dd/yyyy'日期转换格式
diff --git a/src/main/resources/templates/receipt/receiptHeader/add.html b/src/main/resources/templates/receipt/receiptHeader/add.html
index eb8c3b3..aab1227 100644
--- a/src/main/resources/templates/receipt/receiptHeader/add.html
+++ b/src/main/resources/templates/receipt/receiptHeader/add.html
@@ -43,36 +43,36 @@
<!-- </div>-->
<!-- </div>-->
- <div class="form-group">
- <div class="form-control-static col-sm-offset-9" style="margin-left: 205px">
- <button onclick="chooseVehicle()" class="btn btn-primary" type="button">选择车辆入库信息</button>
- </div>
- </div>
+<!-- <div class="form-group">-->
+<!-- <div class="form-control-static col-sm-offset-9" style="margin-left: 205px">-->
+<!-- <button onclick="chooseVehicle()" class="btn btn-primary" type="button">选择车辆入库信息</button>-->
+<!-- </div>-->
+<!-- </div>-->
- <div class="form-group">
- <label class="col-sm-3 control-label">原料批号：</label>
- <div class="col-sm-8">
- <input id="materialBatch" name="materialBatch" class="form-control" type="text" value="0" readonly="readonly">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">车辆毛重：</label>
- <div class="col-sm-8">
- <input id="grossWeight" name="grossWeight" class="form-control" type="text" readonly="readonly">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">车辆皮重：</label>
- <div class="col-sm-8">
- <input id="tareWeight" name="tareWeight" class="form-control" type="text" readonly="readonly">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">车辆净重：</label>
- <div class="col-sm-8">
- <input id="netWeight" name="netWeight" class="form-control" type="text" readonly="readonly">
- </div>
- </div>
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">原料批号：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="materialBatch" name="materialBatch" class="form-control" type="text" value="0" readonly="readonly">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">车辆毛重：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="grossWeight" name="grossWeight" class="form-control" type="text" readonly="readonly">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">车辆皮重：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="tareWeight" name="tareWeight" class="form-control" type="text" readonly="readonly">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">车辆净重：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="netWeight" name="netWeight" class="form-control" type="text" readonly="readonly">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="form-group">
<div class="form-control-static col-sm-offset-9">
<button type="submit" class="btn btn-primary" >提交</button>
@@ -103,7 +103,7 @@
data : {
"receiptType": $("#receiptType option:selected").val(),
"companyCode": $("#companyCode option:selected").val(),
- // "supplierCode": $("input[name='supplierCode']").val(),
+ "supplierCode": $("#supplierCode option:selected").val(),
"receiptNote": $("input[name='receiptNote']").val(),
"grossWeight": $("input[name='grossWeight']").val(),
"tareWeight": $("input[name='tareWeight']").val(),
@@ -142,10 +142,10 @@
});
})
- function chooseVehicle(){
- var url = ctx + "vehicle/vehicleReceipt/listVehicleReceipt";
- $.modal.open("选择车辆入库信息", url);
- }
+ // function chooseVehicle(){
+ // var url = ctx + "vehicle/vehicleReceipt/listVehicleReceipt";
+ // $.modal.open("选择车辆入库信息", url);
+ // }
</script>
</body>
</html>
diff --git a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
index f1c5a00..979b197 100644
--- a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
+++ b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
@@ -202,14 +202,17 @@
<a class="btn btn-outline btn-danger btn-rounded" onclick="batRemove()" shiro:hasPermission="receipt:receiptDetail:remove">
<i class="fa fa-trash-o"></i> 删除
</a>
- <a class="btn btn-outline btn-success btn-rounded" onclick="receiptDetailPrint()" shiro:hasPermission="shipment:bill:report">
- <i class="fa fa-print"></i> 打印
- </a>
- <!--<a class="btn btn-outline btn-success btn-rounded" onclick="batteryPackagePrint()" shiro:hasPermission="shipment:bill:report">
+<!-- <a class="btn btn-outline btn-success btn-rounded" onclick="receiptDetailPrint()" shiro:hasPermission="shipment:bill:report">-->
+<!-- <i class="fa fa-print"></i> 打印-->
+<!-- </a>-->
+ <a class="btn btn-outline btn-success btn-rounded" onclick="batteryPackagePrint()" shiro:hasPermission="shipment:bill:report">
<i class="fa fa-print"></i> 电池包打印
- </a>-->
+ </a>
<a class="btn btn-outline btn-success btn-rounded" onclick="bindCar()" >
- <i class="fa fa-print"></i> 绑定车辆
+ <i class="fa fa-lock"></i> 绑定车辆
+ </a>
+ <a class="btn btn-outline btn-success btn-rounded" onclick="unbindCar()" >
+ <i class="fa fa-unlock"></i> 解绑
</a>
<a class="btn btn-outline btn-primary btn-rounded" onclick="Toreceiving(receiptCode)">
<i class="fa fa-cart-plus"></i> 收货
@@ -244,14 +247,12 @@
var isVirtualBoms = [[${@dict.getType('isVirtualBom')}]];
var receiptId = '';
var receiptCode = '';
+ var supplierCode = '';
let status = [[${status}]];
var statusFirst = [[${statusFirst}]];
var statusLast = [[${statusLast}]];
var receiptType = '';
- var grossWeight = '';
- var tareWeight = '';
- var netWeight = '';
- var materialBatch = '';
+ var supplierCode = '';
$(function() {
var options = {
@@ -265,7 +266,7 @@
search: false,
pageSize: 10,
onDblClickRow: function (row, value, index) {
- detail(row.id, row.code);
+ detail(row.id, row.code,row.receiptType,row.supplierCode);
},
columns: [{
checkbox: true
@@ -683,6 +684,10 @@
visible:false
},
{
+ field : 'electricQuantity',
+ title : '电池包电量'
+ },
+ {
field : 'totalQty',
title : '总数量'
},
@@ -694,10 +699,7 @@
// field : 'batteryPackageWeight',
// title : '电池包重量'
// },
- {
- field : 'electricQuantity',
- title : '电池包电量'
- },
+
{
field : 'openWeight',
title : '已收重量',
@@ -796,14 +798,11 @@
});
/* 入库单列表-详细 */
- function detail(id, code,receiptType,grossWeight,netWeight,tareWeight,materialBatch) {
+ function detail(id, code,receiptTypes,supplierCodes) {
receiptId = id;
receiptCode=code;
- receiptType=receiptType;
- grossWeight=grossWeight;
- netWeight=netWeight;
- tareWeight=tareWeight;
- materialBatch=materialBatch;
+ receiptType=receiptTypes;
+ supplierCode=supplierCodes;
$("#myTab li").removeClass("active");
@@ -885,7 +884,7 @@
}
else {
table.set("bootstrap-table1");
- var url = detailPrefix + "/add/" + receiptId + "/" + receiptCode+ "/" +receiptType+ "/" +grossWeight+ "/" +tareWeight+ "/" +netWeight+ "/" +materialBatch;
+ var url = detailPrefix + "/add/" + receiptId + "/" + receiptCode+ "/" +receiptType+ "/" +supplierCode;
$.modal.open("添加" + table.options.modalName, url);
}
}
@@ -1011,6 +1010,33 @@
})
}
+ function unbindCar(){
+ var rows=$("#bootstrap-table1").bootstrapTable('getSelections');
+ if (rows.length == 0) {
+ $.modal.alertWarning("请至少选择一条记录");
+ return;
+ }
+ $.modal.confirm("确认要解除绑定选中的" + rows.length + "条数据吗?", function() {
+ var ids = "";
+ for(var i=0; i<rows.length; i++) {
+ ids = ids + rows[i].id + ","
+ }
+ var url = ctx + "receipt/receiptDetail/unbindCar/"+ids.substring(0, ids.length-1);
+ var config = {
+ url: url,
+ type: "post",
+ dataType: "json",
+ success: function (result) {
+ if(result.code==web_status.SUCCESS){
+ $.modal.msgSuccess(result.msg);
+ loadDetail();
+ }
+ }
+ };
+ $.ajax(config)
+ })
+ }
+
/* 收货 */
function Toreceiving(code) {