xins
/
HwJyHbMes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4.0.11

Browse Source 
jindie：同步物料信息完善，去掉操作日志的保存（占用空间太大）
wms：同步成品入库到ERP的条件增加
master
xs 2 months ago
parent 75147a0a9b
commit ff59623716
6 changed files with 108 additions and 90 deletions
Show Stats Download Patch File Download Diff File

8
hw-modules/hw-jindie/src/main/java/com/hw/jindie/controller/KingdeeErpSyncController.java
Unescape Escape View File

@ -51,7 +51,7 @@ public class KingdeeErpSyncController {
*/
@PostMapping("/syncUnitInfoFromErp")
// @Log(title = "ERP单位信息", businessType = BusinessType.INSERT)
// @InnerAuth
@InnerAuth
public R<AjaxResult> syncUnitInfoFromErp(@RequestBody ErpSyncInfoVo erpSyncInfoVo) {
try {
return R.ok(AjaxResult.success(kingdeeErpSyncService.syncUnitInfoFromErp(0, erpSyncInfoVo)));
@ -81,7 +81,7 @@ public class KingdeeErpSyncController {
*/
// @Log(title = "ERP物料信息", businessType = BusinessType.INSERT)
@PostMapping(("/syncMaterialInfoFromErp"))
// @InnerAuth
@InnerAuth
public R<AjaxResult> syncMaterialInfoFromErp(@RequestBody ErpSyncInfoVo erpSyncInfoVo) {
try {
return R.ok(AjaxResult.success(kingdeeErpSyncService.syncMaterialInfoFromErp(0, erpSyncInfoVo)));
@ -113,7 +113,7 @@ public class KingdeeErpSyncController {
*/
@PostMapping("/syncSaleOrderFromErp")
// @Log(title = "ERP销售订单", businessType = BusinessType.INSERT)
// @InnerAuth
@InnerAuth
public R<AjaxResult> syncSaleOrderFromErp(@RequestBody ErpSyncInfoVo erpSyncInfoVo) {
try {
return R.ok(AjaxResult.success(kingdeeErpSyncService.syncSaleOrderFromErp(0, erpSyncInfoVo)));
@ -144,7 +144,7 @@ public class KingdeeErpSyncController {
*/
@PostMapping("/syncPurchaseReceiveBillFromErp")
// @Log(title = "ERP采购收料单", businessType = BusinessType.INSERT)
// @InnerAuth
@InnerAuth
public R<AjaxResult> syncPurchaseReceiveBillFromErp(@RequestBody ErpSyncInfoVo erpSyncInfoVo) {
try {
return R.ok(AjaxResult.success(kingdeeErpSyncService.syncPurchaseReceiveBillFromErp(0, erpSyncInfoVo)));

165
hw-modules/hw-jindie/src/main/java/com/hw/jindie/service/impl/KingdeeErpSyncServiceImpl.java
Unescape Escape View File

@ -106,14 +106,16 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
queryJson.put("SubSystemId", "");
//条件查询
StringBuilder filterStringBuilder = new StringBuilder();
filterStringBuilder.append("FUseOrgId.FNumber = 100");
// System.out.println(queryJson.toString());
queryJson.put("FilterString", filterStringBuilder.toString());
String result = api.billQuery(queryJson.toString());
if (StringUtils.isEmpty(result)) {
return 1;
}
// System.out.println("部门单据查询接口: " + result);
System.out.println("部门单据查询接口: " + result);
JSONArray resultArray = JSONArray.parseArray(result);
if (resultArray == null) {
return 1;
@ -241,7 +243,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
throw new ServiceException(result);
}
logger.info("Sync BD_Unit query parameter:"+queryJson.toString()+"\nresult:"+result);
logger.info("Sync BD_Unit query parameter:"+queryJson.toString());
if (StringUtils.isEmpty(result)) {
return 1;
}
@ -381,7 +383,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
throw new ServiceException(result);
}
logger.info("Sync BD_Supplier query parameter:"+queryJson.toString()+"\nresult:"+result);
logger.info("Sync BD_Supplier query parameter:"+queryJson.toString());
if (StringUtils.isEmpty(result)) {
return 1;
}
@ -393,7 +395,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
List<MesBaseSupplierInfo> toInsertSupplierInfoList = new ArrayList<>();
List<MesBaseSupplierInfo> toUpdateSupplierInfoList = new ArrayList<>();
List<SysOperLog> sysOperLogList = new ArrayList<>();
// List<SysOperLog> sysOperLogList = new ArrayList<>();
Date currentDate = new Date();
try {
for (int i = 0; i < resultArray.size(); i++) {
@ -436,14 +438,14 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
if (existedMesBaseSupplierInfo != null) {
mesBaseSupplierInfo.setSupplierId(existedMesBaseSupplierInfo.getSupplierId());
toUpdateSupplierInfoList.add(mesBaseSupplierInfo);
SysOperLog sysOperLog = this.getSysOperLog("供应商信息同步", 2, "com.hw.jindie.controller.KingdeeErpSyncController.syncSupplierInfoFromErp",
"POST", "syncSupplierInfoFromErp", "BD_Supplier(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
sysOperLogList.add(sysOperLog);
// SysOperLog sysOperLog = this.getSysOperLog("供应商信息同步", 2, "com.hw.jindie.controller.KingdeeErpSyncController.syncSupplierInfoFromErp",
// "POST", "syncSupplierInfoFromErp", "BD_Supplier(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
// sysOperLogList.add(sysOperLog);
} else {
toInsertSupplierInfoList.add(mesBaseSupplierInfo);
SysOperLog sysOperLog = this.getSysOperLog("供应商信息同步", 1, "com.hw.jindie.controller.KingdeeErpSyncController.syncSupplierInfoFromErp",
"POST", "syncSupplierInfoFromErp", "BD_Supplier(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
sysOperLogList.add(sysOperLog);
// SysOperLog sysOperLog = this.getSysOperLog("供应商信息同步", 1, "com.hw.jindie.controller.KingdeeErpSyncController.syncSupplierInfoFromErp",
// "POST", "syncSupplierInfoFromErp", "BD_Supplier(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
// sysOperLogList.add(sysOperLog);
}
@ -458,11 +460,11 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
mesBaseSupplierInfoMapper.updateMesBaseSupplierInfo(toUpdatedSupplierInfo);
}
}
if (!sysOperLogList.isEmpty()) {
for (SysOperLog sysOperLog : sysOperLogList) {
remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
}
}
// if (!sysOperLogList.isEmpty()) {
// for (SysOperLog sysOperLog : sysOperLogList) {
// remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
// }
// }
} catch (Exception e) {
e.printStackTrace();
}
@ -505,7 +507,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
JSONObject queryJson = new JSONObject();
String formId = "BD_Material";
String fieldKeys = "FMaterialId,FNumber,FName,FBaseUnitId,FSpecification,FNETWEIGHT,FGROSSWEIGHT," +
String fieldKeys = "FMaterialId,FNumber,FName,FBaseUnitId,FSpecification,FNETWEIGHT,FGROSSWEIGHT,FDocumentStatus," +
"FCreateDate,FModifyDate,FApproveDate,FCreateOrgId,FUseOrgId,FPurchasePriceUnitId";
// String filterString = "FNumber='98010102'";
String orderString = "";
@ -527,11 +529,16 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
//条件查询
StringBuilder filterStringBuilder = new StringBuilder();
filterStringBuilder.append("FNumber like '%").append(materialCodePrefix).append("%'");
filterStringBuilder.append(" and FDocumentStatus='C'");
filterStringBuilder.append(" and FForbidStatus='A'");
filterStringBuilder.append(" and FUseOrgId.FNumber = 100");
if (StringUtils.isNotEmpty(maxErpModifyDate)) {
filterStringBuilder.append(" and FModifyDate >'").append(maxErpModifyDate).append("'");
}
queryJson.put("FilterString", filterStringBuilder.toString());
System.out.println("fiterString:"+filterStringBuilder.toString());
System.out.println(queryJson.toString());
@ -542,7 +549,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
throw new ServiceException(result);
}
logger.info("Sync BD_Material query parameter:"+queryJson.toString()+"\nresult:"+result);
logger.info("Sync BD_Material query parameter:"+queryJson.toString());
if (StringUtils.isEmpty(result)) {
return 1;
}
@ -588,6 +595,8 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
//采购计量单价
Long purchasePriceUnitId = resultObject.getLong("FPurchasePriceUnitId");
String documentStatus = resultObject.getString("FDocumentStatus");
mesBaseMaterialInfo.setErpId(erpId);
mesBaseMaterialInfo.setMaterialCode(materialCode);
mesBaseMaterialInfo.setMaterialName(materialName);
@ -599,6 +608,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
mesBaseMaterialInfo.setUseOrgId(useOrgId);
mesBaseMaterialInfo.setUpdateTime(currentDate);
mesBaseMaterialInfo.setPurchasePriceUnitId(purchasePriceUnitId);
mesBaseMaterialInfo.setOldMaterialCode(documentStatus);
if (StringUtils.isNotEmpty(createDateStr)) {
mesBaseMaterialInfo.setCreateTime(conversionERPTime(createDateStr));
@ -612,27 +622,32 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
mesBaseMaterialInfo.setApproveDate(conversionERPTime(approveDateStr));
}
MesBaseMaterialInfo existedMesBaseMaterialInfo = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByErpId(erpId);
/**迁移时使用*/
// MesBaseMaterialInfo existedMesBaseMaterialInfo = mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialCode(materialCode);
if (existedMesBaseMaterialInfo != null) {
mesBaseMaterialInfo.setMaterialId(existedMesBaseMaterialInfo.getMaterialId());
System.out.println("update："+existedMesBaseMaterialInfo.toString());
toUpdateMaterialInfoList.add(mesBaseMaterialInfo);
SysOperLog sysOperLog = this.getSysOperLog("物料信息同步", 2, "com.hw.jindie.controller.KingdeeErpSyncController.syncMaterialInfoFromErp",
"POST", "syncMaterialInfoFromErp", "BD_Material(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
sysOperLogList.add(sysOperLog);
// SysOperLog sysOperLog = this.getSysOperLog("物料信息同步", 2, "com.hw.jindie.controller.KingdeeErpSyncController.syncMaterialInfoFromErp",
// "POST", "syncMaterialInfoFromErp", "BD_Material(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
// sysOperLogList.add(sysOperLog);
} else {
mesBaseMaterialInfo.setActiveFlag(MesConstants.MES_MATERIAL_ACTIVE_FLAG_NORMAL);
toInsertMaterialInfoList.add(mesBaseMaterialInfo);
SysOperLog sysOperLog = this.getSysOperLog("物料信息同步", 1, "com.hw.jindie.controller.KingdeeErpSyncController.syncMaterialInfoFromErp",
"POST", "syncMaterialInfoFromErp", "BD_Material(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
sysOperLogList.add(sysOperLog);
// SysOperLog sysOperLog = this.getSysOperLog("物料信息同步", 1, "com.hw.jindie.controller.KingdeeErpSyncController.syncMaterialInfoFromErp",
// "POST", "syncMaterialInfoFromErp", "BD_Material(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
// sysOperLogList.add(sysOperLog);
}
}
/**迁移先不要insert，预防update时update错误*/
if (!toInsertMaterialInfoList.isEmpty()) {
mesBaseMaterialInfoMapper.batchMesBaseMaterialInfo(toInsertMaterialInfoList);
}
@ -642,11 +657,11 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
}
}
if (!sysOperLogList.isEmpty()) {
for (SysOperLog sysOperLog : sysOperLogList) {
remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
}
}
// if (!sysOperLogList.isEmpty()) {
// for (SysOperLog sysOperLog : sysOperLogList) {
// remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
// }
// }
} catch (Exception e) {
e.printStackTrace();
}
@ -745,7 +760,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
throw new ServiceException(result);
}
logger.info("Sync SAL_SaleOrder query parameter:"+queryJson.toString()+"\nresult:"+result);
logger.info("Sync SAL_SaleOrder query parameter:"+queryJson.toString());
JSONArray resultArray = JSONArray.parseArray(result);
System.out.println(resultArray.size());
System.out.println("销售订单单据查询接口: " + result);
@ -841,15 +856,15 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
mesSaleOrder.setSaleOrderId(existedMesSaleOrder.getSaleOrderId());
toUpdateSaleOrderList.add(mesSaleOrder);
SysOperLog sysOperLog = this.getSysOperLog("销售订单信息同步", 2, "com.hw.jindie.controller.KingdeeErpSyncController.syncSaleOrderFromErp",
"POST", "syncSaleOrderFromErp", "SAL_SaleOrder(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
sysOperLogList.add(sysOperLog);
// SysOperLog sysOperLog = this.getSysOperLog("销售订单信息同步", 2, "com.hw.jindie.controller.KingdeeErpSyncController.syncSaleOrderFromErp",
// "POST", "syncSaleOrderFromErp", "SAL_SaleOrder(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
// sysOperLogList.add(sysOperLog);
} else {
toInsertSaleOrderList.add(mesSaleOrder);
SysOperLog sysOperLog = this.getSysOperLog("销售订单信息同步", 2, "com.hw.jindie.controller.KingdeeErpSyncController.syncSaleOrderFromErp",
"POST", "syncSaleOrderFromErp", "SAL_SaleOrder(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
sysOperLogList.add(sysOperLog);
// SysOperLog sysOperLog = this.getSysOperLog("销售订单信息同步", 2, "com.hw.jindie.controller.KingdeeErpSyncController.syncSaleOrderFromErp",
// "POST", "syncSaleOrderFromErp", "SAL_SaleOrder(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
// sysOperLogList.add(sysOperLog);
}
}
@ -862,11 +877,11 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
}
}
if (!sysOperLogList.isEmpty()) {
for (SysOperLog sysOperLog : sysOperLogList) {
remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
}
}
// if (!sysOperLogList.isEmpty()) {
// for (SysOperLog sysOperLog : sysOperLogList) {
// remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
// }
// }
} catch (Exception e) {
e.printStackTrace();
}
@ -928,7 +943,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
//条件查询
System.out.println("maxErpModifyDate=" + maxErpModifyDate);
if (StringUtils.isNotEmpty(maxErpModifyDate)) {
String filterString = "FModifyDate >'" + maxErpModifyDate + "' and FDocumentStatus ='C'";
String filterString = "FModifyDate >'" + maxErpModifyDate + "'";
queryJson.put("FilterString", filterString);
}
System.out.println(queryJson.toString());
@ -941,7 +956,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
throw new ServiceException(result);
}
logger.info("Sync TOND_ProjectFile query parameter:"+queryJson.toString()+"\nresult:"+result);
logger.info("Sync TOND_ProjectFile query parameter:"+queryJson.toString());
JSONArray resultArray = JSONArray.parseArray(result);
System.out.println(resultArray.size());
System.out.println("项目信息单据查询接口: " + result);
@ -992,15 +1007,15 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
mesProjectInfo.setProjectId(existedProjectInfo.getProjectId());
toUpdateProjectInfoList.add(mesProjectInfo);
SysOperLog sysOperLog = this.getSysOperLog("项目信息同步", 2, "com.hw.jindie.controller.KingdeeErpSyncController.syncProjectInfoFromErp",
"POST", "syncProjectInfoFromErp", "TOND_ProjectFile(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
sysOperLogList.add(sysOperLog);
// SysOperLog sysOperLog = this.getSysOperLog("项目信息同步", 2, "com.hw.jindie.controller.KingdeeErpSyncController.syncProjectInfoFromErp",
// "POST", "syncProjectInfoFromErp", "TOND_ProjectFile(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
// sysOperLogList.add(sysOperLog);
} else {
toInsertProjectInfoList.add(mesProjectInfo);
SysOperLog sysOperLog = this.getSysOperLog("项目信息同步", 1, "com.hw.jindie.controller.KingdeeErpSyncController.syncProjectInfoFromErp",
"POST", "syncProjectInfoFromErp", "TOND_ProjectFile(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
sysOperLogList.add(sysOperLog);
// SysOperLog sysOperLog = this.getSysOperLog("项目信息同步", 1, "com.hw.jindie.controller.KingdeeErpSyncController.syncProjectInfoFromErp",
// "POST", "syncProjectInfoFromErp", "TOND_ProjectFile(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
// sysOperLogList.add(sysOperLog);
}
}
if (!toInsertProjectInfoList.isEmpty()) {
@ -1012,11 +1027,11 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
}
}
if (!sysOperLogList.isEmpty()) {
for (SysOperLog sysOperLog : sysOperLogList) {
remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
}
}
// if (!sysOperLogList.isEmpty()) {
// for (SysOperLog sysOperLog : sysOperLogList) {
// remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
// }
// }
} catch (Exception e) {
e.printStackTrace();
}
@ -1102,7 +1117,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
throw new ServiceException(result);
}
logger.info("Sync PUR_PurchaseOrder query parameter:"+queryJson.toString()+"\nresult:"+result);
logger.info("Sync PUR_PurchaseOrder query parameter:"+queryJson.toString());
JSONArray resultArray = JSONArray.parseArray(result);
// System.out.println(resultArray.size());
// System.out.println("采购订单单据查询接口: " + result);
@ -1208,16 +1223,16 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
mesPurchaseOrder.setPurchaseOrderId(existedPurchaseOrder.getPurchaseOrderId());
toUpdatePurchaseOrderList.add(mesPurchaseOrder);
SysOperLog sysOperLog = this.getSysOperLog("采购订单信息同步", 2, "com.hw.jindie.controller.KingdeeErpSyncController.syncPurchaseOrderFromErp",
"POST", "syncPurchaseOrderFromErp", "PUR_PurchaseOrder(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
sysOperLogList.add(sysOperLog);
// SysOperLog sysOperLog = this.getSysOperLog("采购订单信息同步", 2, "com.hw.jindie.controller.KingdeeErpSyncController.syncPurchaseOrderFromErp",
// "POST", "syncPurchaseOrderFromErp", "PUR_PurchaseOrder(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
// sysOperLogList.add(sysOperLog);
} else {
mesPurchaseOrder.setOrderStatus(MesConstants.MES_PURCHASE_ORDER_STATUS_TOPURCHASE);
toInsertPurchaseOrderList.add(mesPurchaseOrder);
SysOperLog sysOperLog = this.getSysOperLog("采购订单信息同步", 1, "com.hw.jindie.controller.KingdeeErpSyncController.syncPurchaseOrderFromErp",
"POST", "syncPurchaseOrderFromErp", "PUR_PurchaseOrder(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
sysOperLogList.add(sysOperLog);
// SysOperLog sysOperLog = this.getSysOperLog("采购订单信息同步", 1, "com.hw.jindie.controller.KingdeeErpSyncController.syncPurchaseOrderFromErp",
// "POST", "syncPurchaseOrderFromErp", "PUR_PurchaseOrder(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
// sysOperLogList.add(sysOperLog);
}
}
if (!toInsertPurchaseOrderList.isEmpty()) {
@ -1229,11 +1244,11 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
}
}
if (!sysOperLogList.isEmpty()) {
for (SysOperLog sysOperLog : sysOperLogList) {
remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
}
}
// if (!sysOperLogList.isEmpty()) {
// for (SysOperLog sysOperLog : sysOperLogList) {
// remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
// }
// }
} catch (Exception e) {
e.printStackTrace();
}
@ -1319,7 +1334,7 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
throw new ServiceException(result);
}
logger.info("Sync PUR_ReceiveBill query parameter:"+queryJson.toString()+"\nresult:"+result);
logger.info("Sync PUR_ReceiveBill query parameter:"+queryJson.toString());
JSONArray resultArray = JSONArray.parseArray(result);
// System.out.println(resultArray.size());
// System.out.println("采购订单单据查询接口: " + result);
@ -1453,9 +1468,9 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
// System.out.println("l:"+resultArray.get(i).toString().length());
Long costTime = System.currentTimeMillis() - beginTimeL;
SysOperLog sysOperLog = this.getSysOperLog("收料通知单信息同步", 1, "com.hw.jindie.controller.KingdeeErpSyncController.syncPurchaseReceiveBillFromErp",
"POST", "syncPurchaseReceiveBillFromErp", "PUR_ReceiveBill(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
sysOperLogList.add(sysOperLog);
// SysOperLog sysOperLog = this.getSysOperLog("收料通知单信息同步", 1, "com.hw.jindie.controller.KingdeeErpSyncController.syncPurchaseReceiveBillFromErp",
// "POST", "syncPurchaseReceiveBillFromErp", "PUR_ReceiveBill(" + queryJson.toString() + ")", resultArray.get(i).toString(), currentDate, 1L);
// sysOperLogList.add(sysOperLog);
}
@ -1470,11 +1485,11 @@ public class KingdeeErpSyncServiceImpl implements IKingdeeErpSyncService {
this.insertSysPointRouter(notifyInfoBuilder.toString());
mesPurchaseReceiveBillMapper.batchMesBasePurchaseReceiveBill(toInsertPurchaseReceiveBillList);
}
if (!sysOperLogList.isEmpty()) {
for (SysOperLog sysOperLog : sysOperLogList) {
remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
}
}
// if (!sysOperLogList.isEmpty()) {
// for (SysOperLog sysOperLog : sysOperLogList) {
// remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
// }
// }
} catch (Exception e) {
e.printStackTrace();

17
hw-modules/hw-job/src/main/java/com/hw/job/task/RyTask.java
Unescape Escape View File

@ -98,7 +98,7 @@ public class RyTask {
System.out.println("++同步ERP中物料供应商++ErpSupplierInfo");
R<AjaxResult> resultR = remoteJindieService.syncUnitInfoFromErp(erpSyncInfoVo, SecurityConstants.INNER);
if (resultR.getCode() == 500) {
throw new ServiceException("同步物料失败："+resultR.getMsg());
throw new ServiceException("同步单位失败："+resultR.getMsg());
}
}
@ -107,9 +107,10 @@ public class RyTask {
ErpSyncInfoVo erpSyncInfoVo = new ErpSyncInfoVo();
erpSyncInfoVo.setMaxErpModifyDate(maxErpModifyDate);
System.out.println("++同步ERP中物料供应商++ErpSupplierInfo");
R<AjaxResult> resultR = remoteJindieService.syncSupplierInfoFromErp(erpSyncInfoVo, SecurityConstants.INNER);
R<?> resultR = remoteJindieService.syncSupplierInfoFromErp(erpSyncInfoVo, SecurityConstants.INNER);
System.out.println("--"+resultR);
if (resultR.getCode() == 500) {
throw new ServiceException("同步物料失败："+resultR.getMsg());
throw new ServiceException("同步供应商失败："+resultR.getMsg());
}
}
@ -130,7 +131,7 @@ public class RyTask {
System.out.println("++同步ERP中项目信息++ErpProjectInfo");
R<AjaxResult> resultR = remoteJindieService.syncProjectInfoFromErp(erpSyncInfoVo, SecurityConstants.INNER);
if (resultR.getCode() == 500) {
throw new ServiceException("同步物料失败："+resultR.getMsg());
throw new ServiceException("同步项目失败："+resultR.getMsg());
}
}
@ -140,7 +141,7 @@ public class RyTask {
System.out.println("++同步ERP中销售订单信息++ErpSaleOrder");
R<AjaxResult> resultR =remoteJindieService.syncSaleOrderFromErp(erpSyncInfoVo, SecurityConstants.INNER);
if (resultR.getCode() == 500) {
throw new ServiceException("同步物料失败："+resultR.getMsg());
throw new ServiceException("同步销售订单失败："+resultR.getMsg());
}
}
@ -150,7 +151,7 @@ public class RyTask {
System.out.println("++同步ERP中采购订单信息++syncPurchaseOrderFromErp");
R<AjaxResult> resultR =remoteJindieService.syncPurchaseOrderFromErp(erpSyncInfoVo, SecurityConstants.INNER);
if (resultR.getCode() == 500) {
throw new ServiceException("同步物料失败："+resultR.getMsg());
throw new ServiceException("同步采购订单失败："+resultR.getMsg());
}
}
@ -160,7 +161,7 @@ public class RyTask {
System.out.println("++同步ERP中收料通知单信息++syncPurchaseReceiveBillFromErp");
R<AjaxResult> resultR =remoteJindieService.syncPurchaseReceiveBillFromErp(erpSyncInfoVo, SecurityConstants.INNER);
if (resultR.getCode() == 500) {
throw new ServiceException("同步物料失败："+resultR.getMsg());
throw new ServiceException("同步收料通知单失败："+resultR.getMsg());
}
}
@ -169,7 +170,7 @@ public class RyTask {
System.out.println(new Date() + "++定时同步原材料入库信息给ERP++syncInventoryInformationToERP");
R<AjaxResult> resultR = remoteWmsService.synchronizeInventoryInformationToERP(SecurityConstants.INNER);
if (resultR.getCode() == 500) {
throw new ServiceException("同步物料失败："+resultR.getMsg());
throw new ServiceException("同步原材料入库失败："+resultR.getMsg());
}
}

3
hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseOrderMapper.xml
Unescape Escape View File

@ -502,7 +502,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectPurchaseOrderJoinSupplierProjectByOrderId" parameterType="Long" resultMap="MesPurchaseOrderResult">
select a.purchase_order_id, a.po_no, a.document_status, a.tond_base, a.supplier_id,a.specification_parameter,a.src_bill_no,b.supplier_code,mpi.project_no
select a.purchase_order_id, a.po_no, a.document_status, a.tond_base, a.supplier_id,a.specification_parameter,
a.src_bill_no,b.supplier_code,mpi.project_no
from mes_purchase_order a
left join mes_base_supplier_info b on a.supplier_id=b.erp_id
left join mes_project_info mpi on a.tond_base = mpi.erp_id

2
hw-modules/hw-system/src/main/java/com/hw/system/common/controller/SysPointRouterController.java
Unescape Escape View File

@ -106,7 +106,7 @@ public class SysPointRouterController extends BaseController {
* @return
*/
@InnerAuth
@Log(title = "提示路由信息", businessType = BusinessType.INSERT)
// @Log(title = "提示路由信息", businessType = BusinessType.INSERT)
@PostMapping("/insertPointRouterInfo")
public AjaxResult insertPointRouterInfo(@RequestBody List<SysPointRouter> sysPointRouterList) {
return toAjax(sysPointRouterService.insertSysPointRouterList(sysPointRouterList));

1
hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductInstockMapper.xml
Unescape Escape View File

@ -258,6 +258,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where wpi.product_type = '3'
and wpi.execute_status = '2'
and (wpi.erp_status is null or wpi.erp_status != '1')
and wpi.instock_amount > if(wpi.erp_amount is null, 0, wpi.erp_amount)
and wpi.instock_type = '1'
and mbmi.material_classfication = '1'
and mbmi.material_unit_id is not null and mbmi.material_unit_id !=''

Write Preview
Loading…
Cancel
Save