yinq
/
XMXS-OS-BACK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 同步生产进度优化

Browse Source
maser
yinq 3 months ago
parent 61405e82dd
commit 3ddc47997f
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File

5
os-common/src/main/java/com/os/common/constant/MesConstants.java
Unescape Escape View File

@ -44,6 +44,11 @@ public class MesConstants
*/
public static final String MES_IS_ERP_YES = "1";
/**
* 导入类型（0=人工，1=ERP）
*/
public static final String MES_IMPORT_TYPE_ERP = "1";
/**
* 生成工资标识（0未生成 1已生成）
*/

1
os-mes/src/main/java/com/os/mes/api/service/impl/ERPPortServiceImpl.java
Unescape Escape View File

@ -310,6 +310,7 @@ public class ERPPortServiceImpl implements IERPPortService {
ProdPlanInfo prodPlanInfo = new ProdPlanInfo();
prodPlanInfo.setPlanStatus(MesConstants.MES_PLAN_STATUS_FINISH);
prodPlanInfo.setUploadFlag(MesConstants.MES_IS_ERP_NO);
prodPlanInfo.setImportFlag(MesConstants.MES_IMPORT_TYPE_ERP);
List<ProdPlanInfo> planInfoList = prodPlanInfoService.selectProdPlanInfoList(prodPlanInfo);
logger.info("获取到{}条已完成的计划信息", planInfoList.size());
return planInfoList;

10
os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanErpInfoServiceImpl.java
Unescape Escape View File

@ -132,8 +132,14 @@ public class ProdPlanErpInfoServiceImpl implements IProdPlanErpInfoService {
prodPlanInfo.setPlanCode(seqNo);
List<ProdPlanInfo> planInfoList = prodPlanInfoService.selectProdPlanInfoList(prodPlanInfo);
ProdPlanInfo planInfo = planInfoList.get(0);
if (planInfo.getUploadFlag().equals(MesConstants.MES_IS_ERP_YES) || planInfo.getPlanStatus().equals(MesConstants.MES_PLAN_STATUS_FINISH)
|| planInfo.getPlanStatus().equals(MesConstants.MES_PLAN_STATUS_IN) || planInfo.getPlanStatus().equals(MesConstants.MES_PLAN_STATUS_DELETE)) {
if (planInfo.getPlanStatus().equals(MesConstants.MES_PLAN_STATUS_FINISH)){
ProdPlanErpInfo erpInfo = new ProdPlanErpInfo();
erpInfo.setObjId(infoList.get(0).getObjId());
erpInfo.setTaskProgress(planErpInfo.getTaskProgress());
this.updateProdPlanErpInfo(erpInfo);
}
if (planInfo.getUploadFlag().equals(MesConstants.MES_IS_ERP_YES) || planInfo.getPlanStatus().equals(MesConstants.MES_PLAN_STATUS_IN)
|| planInfo.getPlanStatus().equals(MesConstants.MES_PLAN_STATUS_DELETE)) {
continue;
}
planInfo.setPlanCode(seqNo);

9
os-mes/src/main/resources/mapper/mes/prod/ProdPlanInfoMapper.xml
Unescape Escape View File

@ -149,10 +149,11 @@
<if test="updatedTime != null ">and ppi.updated_time = #{updatedTime}</if>
<if test="planBeginTime != null ">and ppi.plan_begin_time = #{planBeginTime}</if>
<if test="planEndTime != null ">and ppi.plan_end_time = #{planEndTime}</if>
<if test="planStatus != null and planStatus != ''">and plan_status = #{planStatus}</if>
<if test="classes != null and classes != ''">and classes = #{classes}</if>
<if test="processCode != null and processCode != ''">and process_code = #{processCode}</if>
<if test="uploadFlag != null and uploadFlag != ''">and upload_flag = #{uploadFlag}</if>
<if test="planStatus != null and planStatus != ''">and ppi.plan_status = #{planStatus}</if>
<if test="classes != null and classes != ''">and ppi.classes = #{classes}</if>
<if test="processCode != null and processCode != ''">and ppi.process_code = #{processCode}</if>
<if test="uploadFlag != null and uploadFlag != ''">and ppi.upload_flag = #{uploadFlag}</if>
<if test="importFlag != null and importFlag != ''">and ppi.import_flag = #{importFlag}</if>
</where>
</select>

Write Preview
Loading…
Cancel
Save