diff --git a/src/main/java/com/huaheng/api/erp/service/TaskReturnServiceImpl.java b/src/main/java/com/huaheng/api/erp/service/TaskReturnServiceImpl.java
index c4dc3b5..3ccccb5 100644
--- a/src/main/java/com/huaheng/api/erp/service/TaskReturnServiceImpl.java
+++ b/src/main/java/com/huaheng/api/erp/service/TaskReturnServiceImpl.java
@@ -228,7 +228,7 @@ public class TaskReturnServiceImpl implements TaskReturnService {
for (int i = 0; i < barCodeDetailList.size(); i++) {
Fentity fentity = new Fentity();
fentity.setFmaterial(barCodeDetailList.get(i).getMaterialCode());
- fentity.setFqty1(barCodeDetailList.get(i).getQty());
+ fentity.setFqty1(barCodeDetailList.get(i).getTotalQty());
fentity.setFstock("CK002");
fentities.add(fentity);
}
diff --git a/src/main/java/com/huaheng/api/general/service/BarCodeApiService.java b/src/main/java/com/huaheng/api/general/service/BarCodeApiService.java
index 796af05..bd47a90 100644
--- a/src/main/java/com/huaheng/api/general/service/BarCodeApiService.java
+++ b/src/main/java/com/huaheng/api/general/service/BarCodeApiService.java
@@ -88,7 +88,6 @@ public class BarCodeApiService {
if(qty == null){
return AjaxResult.error("数量不存在 qty");
}
-
String sn = barCodeDetail.getSn();
}
return AjaxResult.success();
@@ -100,11 +99,7 @@ public class BarCodeApiService {
public AjaxResult addBarCodeApi(BarCodeDomain barCodeDomain){
boolean result = false;
BarCodeHeader header = barCodeDomain.getBarCodeHeader();
- //原料批次
String materialBatch = header.getMaterialBatch();
-// if(materialBatch ==null){
-// return AjaxResult.error("包装信息头错误：原料批次不存在");
-// }
String barCodeHeaderCode = header.getCode();
String fbillno = header.getFbillno();
if(barCodeHeaderCode == null || "".equals(barCodeHeaderCode)){
@@ -151,7 +146,6 @@ public class BarCodeApiService {
barCodeDetail.setCompanyCode(QuantityConstant.DEFAULT_COMPANYCODE);
barCodeDetail.setReceiptId(barCodeHeader.getId());
barCodeDetail.setCode(detail.getCode());
-// barCodeDetail.setPower(detail.getPower());
barCodeDetail.setReceiptCode(barCodeHeader.getCode());
String materialCode = detail.getMaterialCode();
String materialUnit = detail.getMaterialUnit();
@@ -159,14 +153,13 @@ public class BarCodeApiService {
BigDecimal weight = detail.getWeight();
BarCodeHeader oneBarCodeHeader = barCodeHeaderService.getOne(new LambdaQueryWrapper<BarCodeHeader>().eq(BarCodeHeader::getId, barCodeHeader.getId()));
if(weight.compareTo(BigDecimal.ZERO) == 0){
- System.out.println("重量为0,就是装配");
- oneBarCodeHeader.setProType("1");
+ oneBarCodeHeader.setProType("1");//重量为0,就是装配
}else {
- oneBarCodeHeader.setProType("2");
+ oneBarCodeHeader.setProType("2");//有重量就是拆解
}
barCodeHeaderService.updateById(oneBarCodeHeader);
- if(qty.compareTo(BigDecimal.ZERO) == 0){
- System.out.println("数量为0,就是零件，只有重量，把重量放到qty中");
+
+ if (detail.getCode()==null&&"".equals(detail.getCode())) { //没有字条码，属于拆解中的散装，只有重量没有数量，重量赋值给数量
qty=weight;
}
totalQty.add(qty);
@@ -180,10 +173,9 @@ public class BarCodeApiService {
barCodeDetail.setMaterialName(material.getName());
barCodeDetail.setMaterialSpec(material.getSpec());
barCodeDetail.setMaterialUnit(material.getUnit());
- barCodeDetail.setQty(qty);
+ barCodeDetail.setTotalQty(qty);
barCodeDetail.setSn(detail.getSn());
barCodeDetail.setWeight(weight);
-
barCodeDetail.setConstitute(detail.getConstitute());
barCodeDetail.setProductType(detail.getProductType());
barCodeDetail.setBatteryModel(detail.getBatteryModel());
diff --git a/src/main/java/com/huaheng/pc/barcode/barcodeDetail/domain/BarCodeDetail.java b/src/main/java/com/huaheng/pc/barcode/barcodeDetail/domain/BarCodeDetail.java
index 132ddd6..2c833bb 100644
--- a/src/main/java/com/huaheng/pc/barcode/barcodeDetail/domain/BarCodeDetail.java
+++ b/src/main/java/com/huaheng/pc/barcode/barcodeDetail/domain/BarCodeDetail.java
@@ -101,6 +101,12 @@ public class BarCodeDetail implements Serializable {
@ApiModelProperty(value = "批次")
private String batch;
/**
+ * 数量
+ */
+ @TableField(value = "qty")
+ @ApiModelProperty(value = "数量")
+ private BigDecimal qty;
+ /**
* 总数量
*/
@TableField(value = "totalQty")
@@ -219,12 +225,6 @@ public class BarCodeDetail implements Serializable {
@ApiModelProperty(value = "序列号")
private String sn;
- /**
- * 数量
- */
- @TableField(value = "qty")
- @ApiModelProperty(value = "数量")
- private BigDecimal qty;
/**
* 总重量
diff --git a/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java b/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
index 4b167f6..788b216 100644
--- a/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
+++ b/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
@@ -199,7 +199,7 @@ public class RyTask extends BaseController {
for (int i = 0; i < barCodeDetailList.size(); i++) {
Fentity fentity = new Fentity();
fentity.setFmaterial(barCodeDetailList.get(i).getMaterialCode());
- fentity.setFqty1(barCodeDetailList.get(i).getQty());
+ fentity.setFqty1(barCodeDetailList.get(i).getTotalQty());
fentity.setFstock("CK002");
fentities.add(fentity);
}
@@ -298,7 +298,7 @@ public class RyTask extends BaseController {
for (int i = 0; i < barCodeDetailList.size(); i++) {
Fentity fentity = new Fentity();
fentity.setFmaterial(barCodeDetailList.get(i).getMaterialCode());
- fentity.setFqty1(barCodeDetailList.get(i).getQty());
+ fentity.setFqty1(barCodeDetailList.get(i).getTotalQty());
fentity.setFstock("CK002");
fentities.add(fentity);
}
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 7353fab..b2c0734 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
@@ -798,7 +798,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
receiptContainerDetail.setMaterialSpec(receiptDetail.getMaterialSpec());
receiptContainerDetail.setMaterialUnit(barCodeDetail.getMaterialUnit());
receiptContainerDetail.setWeights(receiptDetail.getOpenWeight());
- receiptContainerDetail.setQty(barCodeDetail.getQty());
+ receiptContainerDetail.setQty(barCodeDetail.getTotalQty());
receiptContainerDetail.setSn(barCodeDetail.getSn());
receiptContainerDetail.setSupplierCode(receiptDetail.getSupplierCode());
receiptContainerDetail.setBatch(barCodeDetail.getBatch());
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 6d27b4a..d0e402d 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
@@ -874,7 +874,7 @@ public class ReceiptTaskService {
for (BarCodeDetail barCodeDetail : barCodeDetailList) {
taskDetail.setTaskId(taskHeader.getId());
taskDetail.setTaskType(QuantityConstant.TASK_TYPE_WHOLERECEIPT);
- taskDetail.setQty(barCodeDetail.getQty());
+ taskDetail.setQty(barCodeDetail.getTotalQty());
taskDetail.setBillCode(barCodeDetail.getCode());
taskDetail.setWarehouseCode("CS0001");
taskDetail.setCompanyCode("BHF");