|
|
@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
|
|
|
import java.math.RoundingMode;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
@ -1343,7 +1344,8 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
|
|
|
|
List<MesPurchaseReceiveBill> toUpdatePurchaseReceiveBillList = new ArrayList<>();
|
|
|
|
List<MesPurchaseReceiveBill> toUpdatePurchaseReceiveBillList = new ArrayList<>();
|
|
|
|
List<SysOperLog> sysOperLogList = new ArrayList<>();
|
|
|
|
List<SysOperLog> sysOperLogList = new ArrayList<>();
|
|
|
|
Date currentDate = new Date();
|
|
|
|
Date currentDate = new Date();
|
|
|
|
StringBuilder notifyInfoBuilder = new StringBuilder("收料通知:");
|
|
|
|
String lineSeparator = System.lineSeparator();
|
|
|
|
|
|
|
|
StringBuilder notifyInfoBuilder = new StringBuilder("收料通知:").append(lineSeparator);
|
|
|
|
Long projectErpId = null;
|
|
|
|
Long projectErpId = null;
|
|
|
|
String projectName = "";
|
|
|
|
String projectName = "";
|
|
|
|
try {
|
|
|
|
try {
|
|
|
@ -1382,10 +1384,10 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
|
|
|
|
Long supplierId = resultObject.getLong("FSupplierId");
|
|
|
|
Long supplierId = resultObject.getLong("FSupplierId");
|
|
|
|
|
|
|
|
|
|
|
|
//交货数量
|
|
|
|
//交货数量
|
|
|
|
BigDecimal actReceiveAmount = resultObject.getBigDecimal("FActReceiveQty");
|
|
|
|
BigDecimal actReceiveAmount = resultObject.getBigDecimal("FActReceiveQty").setScale(2, RoundingMode.DOWN);
|
|
|
|
|
|
|
|
|
|
|
|
//实到数量
|
|
|
|
//实到数量
|
|
|
|
BigDecimal actlandAmount = resultObject.getBigDecimal("FActlandQty");
|
|
|
|
BigDecimal actlandAmount = resultObject.getBigDecimal("FActlandQty").setScale(2, RoundingMode.DOWN);;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//创建时间
|
|
|
|
//创建时间
|
|
|
@ -1463,7 +1465,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
|
|
|
|
notifyInfoBuilder.append("物料名称:").append(materialName).append("|物料规格:").append(materialSpec)
|
|
|
|
notifyInfoBuilder.append("物料名称:").append(materialName).append("|物料规格:").append(materialSpec)
|
|
|
|
.append("|实到数量:").append(actlandAmount).append("|预计到货日期:")
|
|
|
|
.append("|实到数量:").append(actlandAmount).append("|预计到货日期:")
|
|
|
|
.append(preDeliveryDate).append("|项目名称:").append(projectName)
|
|
|
|
.append(preDeliveryDate).append("|项目名称:").append(projectName)
|
|
|
|
.append(";");
|
|
|
|
.append(";").append(lineSeparator);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// System.out.println("l:"+resultArray.get(i).toString().length());
|
|
|
|
// System.out.println("l:"+resultArray.get(i).toString().length());
|
|
|
|
|
|
|
|
|
|
|
|