diff --git a/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java b/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java
index baf3675..5633437 100644
--- a/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java
+++ b/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java
@@ -205,37 +205,14 @@ public class ReceiptApiService {
receiptDetail.setAllCreditCode(supplier.getAllCreditCode());
receiptDetail.setOldBatterySource(supplier.getName());
}
- //生成电池包二维码
- LambdaQueryWrapper<ReceiptDetail> receiptDetailWrapper = Wrappers.lambdaQuery();
- receiptDetailWrapper.select(ReceiptDetail::getBatteryPackTwoCode);
- receiptDetailWrapper.eq(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType()),ReceiptDetail::getBatteryPackType, receiptDetail.getBatteryPackType());
- receiptDetailWrapper.eq(StringUtils.isEmpty(receiptDetail.getBatteryPackType()),ReceiptDetail::getBatteryPackType, "P1");
- receiptDetailWrapper.orderByDesc(ReceiptDetail::getBatteryPackTwoCode).last("Limit 1");
- ReceiptDetail detail=receiptDetailService.getOne(receiptDetailWrapper);
- String maxCode="0";
- if(null!=detail){
- maxCode=detail.getBatteryPackTwoCode();
- }
- String batteryPackTwoCode=null;
- if(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType())){
- batteryPackTwoCode= DataUtils.createSerialNumber(receiptDetail.getBatteryPackType(),maxCode,1);
- }else{
- batteryPackTwoCode= DataUtils.createSerialNumber("P1",maxCode,1);
- }
- if (material.getIsBattery()!=1) {
- receiptDetail.setBatteryPackTwoCode("");
- }else {
- receiptDetail.setBatteryPackTwoCode(batteryPackTwoCode);
- }
-
- // 生成过磅单号
- String maxCode_p="0";
- if(null!=detail){
- maxCode_p=detail.getPoundCode();
- }
- String poundCode= DataUtils.createSerialNumber("BD",maxCode_p,1);
+ //电池类才生成电池包二维码
+ String batteryPackTwoCode=receiptDetailService.findBatteryPackTwoCode(receiptDetail);
+ receiptDetail.setBatteryPackTwoCode(batteryPackTwoCode);
+ //过磅号
+ String poundCode=receiptDetailService.findPoundCode(receiptDetail);
receiptDetail.setPoundCode(poundCode);
+
if (!receiptDetailService.save(receiptDetail)) {
throw new ServiceException("保存入库明细失败");
}
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java
index 91b9a87..e2fd4da 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java
@@ -406,6 +406,13 @@ public class InventoryDetail implements Serializable {
@ApiModelProperty(value="是否电池，1电池，2非电池")
private Integer materialIsBattery;
+ /**
+ * 过磅单号
+ * @return
+ */
+ @TableField(value = "poundCode")
+ @ApiModelProperty(value="过磅单号")
+ private String poundCode;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/domain/ReceiptContainerDetail.java b/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/domain/ReceiptContainerDetail.java
index ef94e78..5428021 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/domain/ReceiptContainerDetail.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/domain/ReceiptContainerDetail.java
@@ -525,5 +525,13 @@ public class ReceiptContainerDetail implements Serializable {
@ApiModelProperty(value="电池包图片路径")
private String batteryPath;
+ /**
+ * 过磅单号
+ * @return
+ */
+ @TableField(value = "poundCode")
+ @ApiModelProperty(value="过磅单号")
+ private String poundCode;
+
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
index 8336191..9ca8500 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
@@ -356,6 +356,9 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
//电池类才生成电池包二维码
String batteryPackTwoCode=findBatteryPackTwoCode(receiptDetailsave);
receiptDetailsave.setBatteryPackTwoCode(batteryPackTwoCode);
+ //过磅号
+ String poundCode=findPoundCode(receiptDetailsave);
+ receiptDetailsave.setPoundCode(poundCode);
receiptDetailService.updateById(receiptDetailsave);
}
@@ -364,23 +367,39 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
String batteryPackTwoCode=null;
if(receiptDetail.getMaterialIsBattery()==1){
LambdaQueryWrapper<ReceiptContainerDetail> receiptDetailWrapper1 = Wrappers.lambdaQuery();
- //receiptDetailWrapper1.eq(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType()),ReceiptContainerDetail::getBatteryPackType, receiptDetail.getBatteryPackType());
- // receiptDetailWrapper1.eq(StringUtils.isEmpty(receiptDetail.getBatteryPackType()),ReceiptDetail::getBatteryPackType, "P1");
+ receiptDetailWrapper1.eq(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType()),ReceiptContainerDetail::getBatteryPackType, receiptDetail.getBatteryPackType());
+ receiptDetailWrapper1.like(StringUtils.isEmpty(receiptDetail.getBatteryPackType()),ReceiptContainerDetail::getBatteryPackTwoCode, "P1");
receiptDetailWrapper1.orderByDesc(ReceiptContainerDetail::getBatteryPackTwoCode).last("Limit 1");
ReceiptContainerDetail detail1=receiptContainerDetailService.getOne(receiptDetailWrapper1);
String maxCode="0";
if(null!=detail1){
maxCode=detail1.getBatteryPackTwoCode();
}
- batteryPackTwoCode= DataUtils.createSerialNumber(receiptDetail.getBatteryPackType(),maxCode,1);
- /*if(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType())){
+ if(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType())){
+ batteryPackTwoCode= DataUtils.createSerialNumber(receiptDetail.getBatteryPackType(),maxCode,1);
}else{
batteryPackTwoCode= DataUtils.createSerialNumber("P1",maxCode,1);
- }*/
+ }
return batteryPackTwoCode;
}
return batteryPackTwoCode;
}
+ public String findPoundCode(ReceiptDetail receiptDetail){
+ String poundCode=null;
+ if(receiptDetail.getMaterialIsBattery()==1){
+ LambdaQueryWrapper<ReceiptContainerDetail> receiptDetailWrapper = Wrappers.lambdaQuery();
+ //receiptDetailWrapper.eq(StringUtils.isNotEmpty(receiptDetail.getPoundCode()),ReceiptDetail::getPoundCode, receiptDetail.getPoundCode());
+ receiptDetailWrapper.orderByDesc(ReceiptContainerDetail::getPoundCode).last("Limit 1");
+ ReceiptContainerDetail detail=receiptContainerDetailService.getOne(receiptDetailWrapper);
+ // 生成过磅单号
+ String maxCode_p="0";
+ if(null!=detail){
+ maxCode_p=detail.getPoundCode();
+ }
+ poundCode= DataUtils.createSerialNumber("BD",maxCode_p,1);
+ }
+ return poundCode;
+ }
//成品入库组盘校验
public void checkReciptContainer(String barCodeHeaderId){
BarCodeHeader barCodeHeader = barCodeHeaderService.getById(barCodeHeaderId);
@@ -946,6 +965,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
receiptContainerDetail.setElectricQuantity(receiptDetail.getElectricQuantity());
receiptContainerDetail.setBatteryPackageWeight(receiptDetail.getBatteryPackageWeight());
receiptContainerDetail.setBatteryPackTwoCode(receiptDetail.getBatteryPackTwoCode());
+ receiptContainerDetail.setPoundCode(receiptDetail.getPoundCode());
//04-28
receiptContainerDetail.setMaterialNetWeight(receiptDetail.getMaterialNetWeight());
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java b/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java
index 105540b..b4714cb 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java
@@ -68,4 +68,6 @@ public interface ReceiptDetailService extends IService<ReceiptDetail>{
List<ReceiptDetail> findByReceiptId(Integer id);
//生成电池包二维码
String findBatteryPackTwoCode(ReceiptDetail receiptDetail);
+
+ String findPoundCode(ReceiptDetail receiptDetail);
}
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java b/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
index 736d65a..46d8f4b 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
@@ -33,6 +33,7 @@ import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail;
import com.huaheng.pc.config.statusFlow.service.StatusFlowDetailService;
import com.huaheng.pc.config.supplier.domain.Supplier;
import com.huaheng.pc.config.supplier.service.SupplierService;
+import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
import com.huaheng.pc.system.config.domain.Config;
@@ -181,7 +182,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl<ReceiptDetailMapper, R
if(receiptDetail.getMaterialIsBattery()==1){
LambdaQueryWrapper<ReceiptDetail> receiptDetailWrapper1 = Wrappers.lambdaQuery();
receiptDetailWrapper1.eq(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType()),ReceiptDetail::getBatteryPackType, receiptDetail.getBatteryPackType());
- // receiptDetailWrapper1.eq(StringUtils.isEmpty(receiptDetail.getBatteryPackType()),ReceiptDetail::getBatteryPackType, "P1");
+ receiptDetailWrapper1.like(StringUtils.isEmpty(receiptDetail.getBatteryPackType()), ReceiptDetail::getBatteryPackTwoCode, "P1");
receiptDetailWrapper1.orderByDesc(ReceiptDetail::getBatteryPackTwoCode).last("Limit 1");
ReceiptDetail detail1=receiptDetailSerivece.getOne(receiptDetailWrapper1);
String maxCode="0";
@@ -197,18 +198,21 @@ public class ReceiptDetailServiceImpl extends ServiceImpl<ReceiptDetailMapper, R
}
return batteryPackTwoCode;
}
-
+ @Override
public String findPoundCode(ReceiptDetail receiptDetail){
- LambdaQueryWrapper<ReceiptDetail> receiptDetailWrapper = Wrappers.lambdaQuery();
- receiptDetailWrapper.eq(StringUtils.isNotEmpty(receiptDetail.getPoundCode()),ReceiptDetail::getPoundCode, receiptDetail.getPoundCode());
- receiptDetailWrapper.orderByDesc(ReceiptDetail::getBatteryPackTwoCode).last("Limit 1");
- ReceiptDetail detail=receiptDetailSerivece.getOne(receiptDetailWrapper);
- // 生成过磅单号
- String maxCode_p="0";
- if(null!=detail){
- maxCode_p=detail.getPoundCode();
- }
- String poundCode= DataUtils.createSerialNumber("BD",maxCode_p,1);
+ String poundCode=null;
+ if(receiptDetail.getMaterialIsBattery()==1){
+ LambdaQueryWrapper<ReceiptDetail> receiptDetailWrapper = Wrappers.lambdaQuery();
+ //receiptDetailWrapper.eq(StringUtils.isNotEmpty(receiptDetail.getPoundCode()),ReceiptDetail::getPoundCode, receiptDetail.getPoundCode());
+ receiptDetailWrapper.orderByDesc(ReceiptDetail::getPoundCode).last("Limit 1");
+ ReceiptDetail detail=receiptDetailSerivece.getOne(receiptDetailWrapper);
+ // 生成过磅单号
+ String maxCode_p="0";
+ if(null!=detail){
+ maxCode_p=detail.getPoundCode();
+ }
+ poundCode= DataUtils.createSerialNumber("BD",maxCode_p,1);
+ }
return poundCode;
}
diff --git a/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java b/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java
index 920d7ac..0f2d921 100644
--- a/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java
+++ b/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java
@@ -489,6 +489,14 @@ public class TaskDetail implements Serializable {
@ApiModelProperty(value="是否电池，1电池，2非电池")
private Integer materialIsBattery;
+ /**
+ * 过磅单号
+ * @return
+ */
+ @TableField(value = "poundCode")
+ @ApiModelProperty(value="过磅单号")
+ private String poundCode;
+
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
index d0e402d..d08b52d 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
@@ -260,6 +260,9 @@ public class ReceiptTaskService {
taskDetail.setBatteryPackType(item.getBatteryPackType());
taskDetail.setBatteryTypes(item.getBatteryTypes());
taskDetail.setCompleteness(item.getCompleteness());
+
+
+ taskDetail.setPoundCode(item.getPoundCode());
if (!taskDetailService.save(taskDetail)) {
throw new ServiceException("生成任务明细失败");
}
@@ -594,6 +597,7 @@ public class ReceiptTaskService {
inventoryDetail.setQty(receiptQty);
inventoryDetail.setWeights(taskDetail.getWeights());
inventoryDetail.setBatteryPackTwoCode(taskDetail.getBatteryPackTwoCode());
+ inventoryDetail.setPoundCode(taskDetail.getPoundCode());
//inventoryDetail.setElectricQuantity(receiptDetail.getElectricQuantity());
inventoryDetail.setMaterialNetWeight(receiptDetail.getMaterialNetWeight());
inventoryDetail.setTaskQty(new BigDecimal(0));
diff --git a/src/main/resources/templates/receipt/receiptContainerDetail/reportBatteryPackage.html b/src/main/resources/templates/receipt/receiptContainerDetail/reportBatteryPackage.html
index 21cc44f..ff25f24 100644
--- a/src/main/resources/templates/receipt/receiptContainerDetail/reportBatteryPackage.html
+++ b/src/main/resources/templates/receipt/receiptContainerDetail/reportBatteryPackage.html
@@ -13,7 +13,7 @@
}
</style>
-<body class="white-bg" style="padding:5px 0;" id="ddd">
+<body class="white-bg" style="padding:5px 0;font-size:12px;" id="ddd">
<div class="container" style="color: #333;">
<div class="row">
<div class="row" style="text-align:right"><span class="hidden-print" style="padding-left:2px;"><button type="button" onClick="a()"><i class="fa fa-print"></i> 打印</button></span></div>
@@ -21,10 +21,10 @@
th:each="row:${receiptContainerDetails}">
<tbody>
<tr style="height:40%;">
- <td style="margin:0px;width:100%;" align="center" >
+ <td style="margin:0px;width:200px;" align="center" >
<input th:value="${row.batteryPackTwoCode}" type="hidden" name="code"/>
<!--<div style="" class="qrcode"></div>-->
- <img th:src="@{'/image/'+${row.batteryPackTwoCode}}">
+ <img width="170px;" th:src="@{'/image/'+${row.batteryPackTwoCode}}">
</td>
</tr>
<tr style="">
@@ -37,7 +37,7 @@
<span>电池包</span></div>
<div class="divstyle" >
<span >供货商：</span>
- <span th:text="${row.supplierCode}"></span></div>
+ <span th:text="${row.companyName}"></span></div>
<div class="divstyle" >
<span >打印时间：</span>
<span th:text="${row.userDef1}"></span></div>
diff --git a/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html b/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
index 69400bd..4a9fda1 100644
--- a/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
+++ b/src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
@@ -86,6 +86,7 @@
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
modalName: "入库历史",
+ showExport: true, //导出
search: false,
sortName: "id",
sortOrder: "desc",
diff --git a/src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html b/src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
index 29cd145..9aad976 100644
--- a/src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
+++ b/src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
@@ -207,6 +207,7 @@
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
modalName: "出库单",
+ showExport: true, //导出
sortName: "created",
sortOrder: "desc",
search: false,