采购订单 采购申请单 延期提醒 提前提醒
This commit is contained in:
parent
16853a9dc9
commit
8cc9e23ae2
@ -837,13 +837,12 @@ public class KingdeeWorkCenterDataController extends BaseController {
|
||||
}
|
||||
|
||||
@Log(title = "采购订单和采购申请单")
|
||||
@XxlJob("getMassageDelayDate")
|
||||
public R<Void> getMassageDelayDate1() {
|
||||
@XxlJob("getPurchaseOrder")
|
||||
public R<Void> getPurchaseOrder() {
|
||||
try {
|
||||
// String robotId = "4d2f037d-0cee-493a-a4ff-1758f67b8069";
|
||||
String robotId = "483489b2-b219-468c-851f-f56a34a62d91";
|
||||
List<PurchaseOrderExcelDTO> list = JdUtil.getPurchaseOrder();
|
||||
List<PurchaseRequestExcelDTO> list2 = JdUtil.getPurchaseRequestOrder();
|
||||
|
||||
String currentTime = DateUtil.format(new Date(), "yyyy年MM月dd日 HH:mm:ss");
|
||||
StringBuilder msg = new StringBuilder();
|
||||
msg.append("🏭 采购订单和采购申请更新\n\n")
|
||||
@ -914,14 +913,14 @@ public class KingdeeWorkCenterDataController extends BaseController {
|
||||
for (PurchaseOrderExcelDTO item : purchaseOrderList) {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("index", index);
|
||||
map.put("orderNo", item.getFBillNo());
|
||||
map.put("supplierName", item.getFSupplierIdFName());
|
||||
map.put("materialCode", item.getFMaterialIdFNumber());
|
||||
map.put("materialName", item.getFMaterialName());
|
||||
map.put("quantity", item.getFQty());
|
||||
map.put("orderDate", item.getFDate());
|
||||
map.put("deliveryDate", item.getFDeliveryDate());
|
||||
map.put("productionOrderNo", item.getFUCHNText2());
|
||||
map.put("FBillNo", item.getFBillNo());
|
||||
map.put("FSupplierIdFName", item.getFSupplierIdFName());
|
||||
map.put("FMaterialIdFNumber", item.getFMaterialIdFNumber());
|
||||
map.put("FMaterialName", item.getFMaterialName());
|
||||
map.put("FQty", item.getFQty());
|
||||
map.put("FDate", item.getFDate());
|
||||
map.put("FDeliveryDate", item.getFDeliveryDate());
|
||||
map.put("FUCHNText2", item.getFUCHNText2());
|
||||
mapList.add(map);
|
||||
index++;
|
||||
}
|
||||
@ -937,17 +936,17 @@ public class KingdeeWorkCenterDataController extends BaseController {
|
||||
for (PurchaseRequestExcelDTO item : purchaseRequestList) {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("index", index);
|
||||
map.put("requestNo", item.getFBillNo());
|
||||
map.put("billType", item.getFBillTypeID());
|
||||
map.put("suggestPurDate", item.getFSuggestPurDate());
|
||||
map.put("suggestSupplier", item.getFSuggestSupplierId_FName());
|
||||
map.put("materialCode", item.getFMaterialId_FNumber());
|
||||
map.put("materialName", item.getFMaterialName());
|
||||
map.put("priceUnit", item.getFPriceUnitId_FName());
|
||||
map.put("quantity", item.getFReqQty());
|
||||
map.put("arrivalDate", item.getFArrivalDate());
|
||||
map.put("applicationDate", item.getFApplicationDate());
|
||||
map.put("productionOrderNo", item.getFUCHNText());
|
||||
map.put("FBillNo", item.getFBillNo());
|
||||
map.put("FBillTypeID", item.getFBillTypeID());
|
||||
map.put("FSuggestPurDate", item.getFSuggestPurDate());
|
||||
map.put("FSuggestSupplierIdFName", item.getFSuggestSupplierIdFName());
|
||||
map.put("FMaterialIdFNumber", item.getFMaterialIdFNumber());
|
||||
map.put("FMaterialName", item.getFMaterialName());
|
||||
map.put("FPriceUnitIdFName", item.getFPriceUnitIdFName());
|
||||
map.put("FReqQty", item.getFReqQty());
|
||||
map.put("FArrivalDate", item.getFArrivalDate());
|
||||
map.put("FApplicationDate", item.getFApplicationDate());
|
||||
map.put("FUCHNText", item.getFUCHNText());
|
||||
mapList.add(map);
|
||||
index++;
|
||||
}
|
||||
|
||||
@ -27,13 +27,13 @@ public class PurchaseRequestExcelDTO {
|
||||
* 建议供应商名称
|
||||
*/
|
||||
@JsonProperty("FSuggestSupplierId.FName")
|
||||
private String FSuggestSupplierId_FName;
|
||||
private String FSuggestSupplierIdFName;
|
||||
|
||||
/**
|
||||
* 物料编码
|
||||
*/
|
||||
@JsonProperty("FMaterialId.FNumber")
|
||||
private String FMaterialId_FNumber;
|
||||
private String FMaterialIdFNumber;
|
||||
|
||||
/**
|
||||
* 物料名称
|
||||
@ -45,7 +45,7 @@ public class PurchaseRequestExcelDTO {
|
||||
* 计价单位
|
||||
*/
|
||||
@JsonProperty("FPriceUnitId.FName")
|
||||
private String FPriceUnitId_FName;
|
||||
private String FPriceUnitIdFName;
|
||||
|
||||
/**
|
||||
* 申请数量
|
||||
|
||||
BIN
ruoyi-system/src/main/resources/EXCEL模板/采购订单模板.xlsx
Normal file
BIN
ruoyi-system/src/main/resources/EXCEL模板/采购订单模板.xlsx
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user