apsbackend.git - Gitblit

			@@ -4,6 +4,7 @@
			import com.alibaba.fastjson.JSONObject;
			import com.aps.common.core.utils.DateUtils;
			import com.aps.common.core.utils.StringUtils;
			import com.aps.common.core.utils.uuid.Sequence;
			import com.aps.job.domain.ApsWorkOrderJob;
			import com.aps.job.domain.ApsWorkOrderJobLog;
			import com.aps.job.domain.ApsWorkOrderProcess;
			@@ -57,6 +58,9 @@

			@Autowired
			private ApsWorkOrderJobLogMapper apsWorkOrderJobLogMapper;

			@Autowired
			private Sequence sequence;

			/**
			* 查询工单工序
			@@ -178,20 +182,24 @@
			apsWorkOrderProcess.setDocNo(process.getString("DocNo"));
			apsWorkOrderProcess.setOpNum(process.getString("OpNum"));
			apsWorkOrderProcess.setOpId(process.getString("OpID"));
			apsWorkOrderProcess.setProcessName(process.getString("WorkCenter"));
			apsWorkOrderProcess.setStandardTime(process.getFloat("StandardTime"));
			apsWorkOrderProcess.setProcessName(process.getString("StdOp"));
			apsWorkOrderProcess.setStandardTime(process.getBigDecimal("StandardTime"));
			apsWorkOrderProcess.setPalnStartDate(process.getDate("PlanStartDate"));
			apsWorkOrderProcess.setPlanCompleteDate(process.getDate("PlanCompleteDate"));
			apsWorkOrderProcess.setProcessQty(process.getFloat("ProcessQty"));
			apsWorkOrderProcess.setScrapQty(process.getFloat("ScrapQty"));
			apsWorkOrderProcess.setProcessQty(process.getBigDecimal("ProcessQty"));
			apsWorkOrderProcess.setScrapQty(process.getBigDecimal("ScrapQty"));
			apsWorkOrderProcess.setOpStatus(process.getString("OpStatus"));
			apsWorkOrderProcess.setOrg(process.getString("Org"));
			apsWorkOrderProcess.setOrgCode(process.getString("OrgCode"));
			apsWorkOrderProcess.setWorkCenter(process.getString("WorkCenter"));
			if (existsId != null) {
			apsWorkOrderProcess.setId(existsId);
			apsWorkOrderProcess.setUpdateBy("task");
			apsWorkOrderProcess.setUpdateTime(DateUtils.getNowDate());
			updateList.add(apsWorkOrderProcess);
			} else {
			apsWorkOrderProcess.setId(sequence.nextId());
			apsWorkOrderProcess.setCreateBy("task");
			apsWorkOrderProcess.setCreateTime(DateUtils.getNowDate());
			addList.add(apsWorkOrderProcess);
			}
			@@ -219,10 +227,12 @@
			param.put("docNos", haveProcessDocNos);
			apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
			}
			Map<String, Object> param = new HashMap<>();
			param.put("status", "2");
			param.put("docNos", docNos);
			apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
			if(!docNos.isEmpty()){
			Map<String, Object> param = new HashMap<>();
			param.put("status", "2");
			param.put("docNos", docNos);
			apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
			}
			}else{
			apsWorkOrderJobLog.setResponseData(response.getBody());
			apsWorkOrderJobLog.setResult("fail");