no message
parent
43c444c1f5
commit
ce55905eec
|
|
@ -145,7 +145,7 @@ public class ImportAsnServiceImpl implements ImportAsnService {
|
||||||
String po = data.getPoNo();//订单号
|
String po = data.getPoNo();//订单号
|
||||||
String itemCode = data.getPartNo();//品番
|
String itemCode = data.getPartNo();//品番
|
||||||
String remark = data.getDescription();//描述
|
String remark = data.getDescription();//描述
|
||||||
Double orderQty = data.getQty();//数量
|
String orderQty = data.getQty();//数量
|
||||||
String code = data.getCNo();//托盘号
|
String code = data.getCNo();//托盘号
|
||||||
|
|
||||||
//品番
|
//品番
|
||||||
|
|
@ -154,7 +154,7 @@ public class ImportAsnServiceImpl implements ImportAsnService {
|
||||||
Asn asn;
|
Asn asn;
|
||||||
if (asnMap.containsKey(code)) {
|
if (asnMap.containsKey(code)) {
|
||||||
asn = asnMap.get(code);
|
asn = asnMap.get(code);
|
||||||
asn.setOrderQuantity(asn.getOrderQuantity() + orderQty);
|
asn.setOrderQuantity(asn.getOrderQuantity() +Double.parseDouble(orderQty));
|
||||||
} else {
|
} else {
|
||||||
asn = Asn.builder()
|
asn = Asn.builder()
|
||||||
.relatedBill1(relatedBill1)
|
.relatedBill1(relatedBill1)
|
||||||
|
|
@ -162,7 +162,7 @@ public class ImportAsnServiceImpl implements ImportAsnService {
|
||||||
.area(area)
|
.area(area)
|
||||||
.status(BizStatus.OPEN)
|
.status(BizStatus.OPEN)
|
||||||
.orderDate(new Timestamp(new Date().getTime()))
|
.orderDate(new Timestamp(new Date().getTime()))
|
||||||
.orderQuantity(orderQty)
|
.orderQuantity(Double.parseDouble(orderQty))
|
||||||
.billType(billType)
|
.billType(billType)
|
||||||
.receivedQuantity(0d)
|
.receivedQuantity(0d)
|
||||||
.putawayQuantity(0d)
|
.putawayQuantity(0d)
|
||||||
|
|
@ -176,7 +176,7 @@ public class ImportAsnServiceImpl implements ImportAsnService {
|
||||||
.po(po)
|
.po(po)
|
||||||
.item(item)
|
.item(item)
|
||||||
.remark(remark)
|
.remark(remark)
|
||||||
.orderQty(orderQty)
|
.orderQty(Double.parseDouble(orderQty))
|
||||||
.asn(asn)
|
.asn(asn)
|
||||||
.status(BizStatus.OPEN)
|
.status(BizStatus.OPEN)
|
||||||
.receivedQty(0d)
|
.receivedQty(0d)
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ public class BaseImport {
|
||||||
private String description;
|
private String description;
|
||||||
|
|
||||||
@ExcelProperty("Q'TY \n" +"(PCS)")
|
@ExcelProperty("Q'TY \n" +"(PCS)")
|
||||||
private Double qty;
|
private String qty;
|
||||||
|
|
||||||
@ExcelProperty("C/NO.")
|
@ExcelProperty("C/NO.")
|
||||||
private String cNo;
|
private String cNo;
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ public class invoicePackingImport {
|
||||||
private String description;
|
private String description;
|
||||||
|
|
||||||
@ExcelProperty("Q'TY")
|
@ExcelProperty("Q'TY")
|
||||||
private Double qty;
|
private String qty;
|
||||||
|
|
||||||
@ExcelProperty("A-PROS\n" + "CASE NO")
|
@ExcelProperty("A-PROS\n" + "CASE NO")
|
||||||
private String cNo;
|
private String cNo;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue