非通宇 保税仓入口订单推送;
This commit is contained in:
+1
-1
@@ -1981,9 +1981,9 @@ public class ReservationStockInOrderApplicationService {
|
|||||||
gwInDetail.setLineNum("");
|
gwInDetail.setLineNum("");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
gwInDetail.setItemNo(materialBaseInfoId.toString());
|
|
||||||
gwInDetail.setItemName(reservationInMaterialDetail.getMaterialName());
|
gwInDetail.setItemName(reservationInMaterialDetail.getMaterialName());
|
||||||
MaterialBaseInfoPO materialBaseInfoPO = reservationStockInOrderMapper.getinfo(materialBaseInfoId);
|
MaterialBaseInfoPO materialBaseInfoPO = reservationStockInOrderMapper.getinfo(materialBaseInfoId);
|
||||||
|
gwInDetail.setItemNo(materialBaseInfoPO.getMaterialCode());
|
||||||
gwInDetail.setSpec(materialBaseInfoPO.getSpecificationModel());
|
gwInDetail.setSpec(materialBaseInfoPO.getSpecificationModel());
|
||||||
gwInDetail.setUnit(materialBaseInfoPO.getDeclarationUnit());
|
gwInDetail.setUnit(materialBaseInfoPO.getDeclarationUnit());
|
||||||
gwInDetail.setQty(reservationInMaterialDetail.getQuantity());
|
gwInDetail.setQty(reservationInMaterialDetail.getQuantity());
|
||||||
|
|||||||
+4
-5
@@ -1145,10 +1145,6 @@ public class ReservationStockOutOrderApplicationService {
|
|||||||
item.put("lineNum", split[1]);
|
item.put("lineNum", split[1]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
item.put("itemNo", detail.getMaterialBaseInfoId() != null ? detail.getMaterialBaseInfoId().toString() : "");
|
|
||||||
item.put("itemName", detail.getMaterialName() != null ? detail.getMaterialName() : "");
|
|
||||||
item.put("spec", detail.getSpecificationModel() != null ? detail.getSpecificationModel() : "");
|
|
||||||
item.put("unit", detail.getUnit() != null ? detail.getUnit() : "");
|
|
||||||
item.put("qty", detail.getQuantity());
|
item.put("qty", detail.getQuantity());
|
||||||
|
|
||||||
// 获取物料详情
|
// 获取物料详情
|
||||||
@@ -1157,7 +1153,10 @@ public class ReservationStockOutOrderApplicationService {
|
|||||||
if (materialBaseInfoPO != null) {
|
if (materialBaseInfoPO != null) {
|
||||||
item.put("erpCurr", materialBaseInfoPO.getCurrency() != null ? materialBaseInfoPO.getCurrency() : "");
|
item.put("erpCurr", materialBaseInfoPO.getCurrency() != null ? materialBaseInfoPO.getCurrency() : "");
|
||||||
item.put("erpPrice", materialBaseInfoPO.getUnitPrice());
|
item.put("erpPrice", materialBaseInfoPO.getUnitPrice());
|
||||||
|
item.put("itemNo", materialBaseInfoPO.getMaterialCode() != null ? materialBaseInfoPO.getMaterialCode() : "");
|
||||||
|
item.put("itemName", materialBaseInfoPO.getMaterialName() != null ? materialBaseInfoPO.getMaterialName() : "");
|
||||||
|
item.put("spec", materialBaseInfoPO.getSpecificationModel() != null ? materialBaseInfoPO.getSpecificationModel() : "");
|
||||||
|
item.put("unit", materialBaseInfoPO.getDeclarationUnit() != null ? materialBaseInfoPO.getDeclarationUnit() : "");
|
||||||
// 计算金额
|
// 计算金额
|
||||||
BigDecimal unitPrice = materialBaseInfoPO.getUnitPrice();
|
BigDecimal unitPrice = materialBaseInfoPO.getUnitPrice();
|
||||||
BigDecimal quantity = detail.getQuantity();
|
BigDecimal quantity = detail.getQuantity();
|
||||||
|
|||||||
Reference in New Issue
Block a user