|
|
@@ -1441,11 +1441,14 @@ public class MESServiceImpl implements MESService {
|
|
|
JSONArray detail = data.get("detail");
|
|
|
if(detail!=null&&detail.size()>0){
|
|
|
String macode = StringUtil.valueOf(JSON.parseObject(StringUtil.nvl(detail.get(0), "{}")).get("FICMOBillNo"));
|
|
|
- Object[] data1 = baseDao.getFieldsDataByCondition("Make", "ma_tasktype,ma_id,ma_status", "ma_code in ('" + macode + "')");
|
|
|
+ Object[] data1 = baseDao.getFieldsDataByCondition("Make", "ma_tasktype,ma_id,ma_status,ma_finishstatus", "ma_code in ('" + macode + "')");
|
|
|
if (data1!=null&&data1.length>0) {
|
|
|
if ("已结案".equals(StringUtil.nvl(data1[2], ""))){
|
|
|
return ApiResponse.failRsp("10041", requestId, "工单："+macode+"在ERP已结案，不允许领料！");
|
|
|
}
|
|
|
+ if ("已完工".equals(StringUtil.nvl(data1[3], ""))){
|
|
|
+ return ApiResponse.failRsp("10041", requestId, "工单："+macode+"在ERP已完工，不允许领料！");
|
|
|
+ }
|
|
|
ma_tasktype = StringUtil.nvl(data1[0], "");
|
|
|
maid = Integer.parseInt(StringUtil.nvl(data1[1], "0"));
|
|
|
}else {
|
koul