root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-10-21 16:26:22 +08:00
parent b7485a6406 d4c01560ef
commit 54b8277e35
5 changed files with 160 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
View File

@@ -465,7 +465,8 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
} }
String area_type = pointObj.getString("area_type"); String area_type = pointObj.getString("area_type");
String bucketunique = jsonObject.get("bucketunique"); String bucketunique = jsonObject.get("bucketunique");
String out_qty = NumberUtil.round(MapUtil.getStr(jsonObject,"out_qty"), 2).toString(); //需出重量
String out_qty = jsonObject.get("out_qty");
//根据桶查询物料批次信息 //根据桶查询物料批次信息
JSONObject bucketObj = WQLObject.getWQLObject("md_pb_bucketrecord").query("bucketunique='" + bucketunique + "'").uniqueResult(0); JSONObject bucketObj = WQLObject.getWQLObject("md_pb_bucketrecord").query("bucketunique='" + bucketunique + "'").uniqueResult(0);
String material_id = bucketObj.getString("material_id"); String material_id = bucketObj.getString("material_id");

60
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java
View File

@@ -447,7 +447,7 @@ public class DailyplanServiceImpl implements DailyplanService {
JSONObject jo_new = MPS_BD_ProductDailyPlan.query("dailyplan_id='"+jo.getString("dailyplan_id")+"' and status='01'").uniqueResult(0); JSONObject jo_new = MPS_BD_ProductDailyPlan.query("dailyplan_id='"+jo.getString("dailyplan_id")+"' and status='01'").uniqueResult(0);
if (jo_new!=null) { if (jo_new!=null) {
ja_new.add(jo); ja_new.add(jo);
MPS_BD_ProductDailyPlan.delete(jo); MPS_BD_ProductDailyPlan.delete("dailyplan_id='"+jo.getString("dailyplan_id")+"' and status='01'");
} }
} }
@@ -523,7 +523,8 @@ public class DailyplanServiceImpl implements DailyplanService {
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
jo.put("planend_date",DateUtil.formatDate(planend_date)); jo.put("planend_date",DateUtil.formatDate(planend_date));
ja_new2.add(this.createDay(jo)); JSONObject jo_now = this.createDay(jo);
ja_new2.add(jo_now);
date = DateUtil.offsetDay(date,1); date = DateUtil.offsetDay(date,1);
pcsn_num = pcsn_num - pcsn_num_day; pcsn_num = pcsn_num - pcsn_num_day;
@@ -537,7 +538,8 @@ public class DailyplanServiceImpl implements DailyplanService {
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
jo.put("planend_date",DateUtil.formatDate(planend_date)); jo.put("planend_date",DateUtil.formatDate(planend_date));
ja_new2.add(this.createDay(jo)); JSONObject jo_now = this.createDay(jo);
ja_new2.add(jo_now);
pcsn_num_day = pcsn_num_day - pcsn_num; pcsn_num_day = pcsn_num_day - pcsn_num;
if(pcsn_num_day <= 0){ if(pcsn_num_day <= 0){
@@ -559,7 +561,8 @@ public class DailyplanServiceImpl implements DailyplanService {
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
jo.put("planend_date",DateUtil.formatDate(planend_date)); jo.put("planend_date",DateUtil.formatDate(planend_date));
ja_new2.add(this.createDay(jo)); JSONObject jo_now = this.createDay(jo);
ja_new2.add(jo_now);
date = DateUtil.offsetDay(date,1); date = DateUtil.offsetDay(date,1);
pcsn_num =pcsn_num - totalproducecapacity_qty; pcsn_num =pcsn_num - totalproducecapacity_qty;
fact_weight = fact_weight - totalproducecapacity_qty*standard_weight; fact_weight = fact_weight - totalproducecapacity_qty*standard_weight;
@@ -572,7 +575,8 @@ public class DailyplanServiceImpl implements DailyplanService {
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
jo.put("planend_date",DateUtil.formatDate(planend_date)); jo.put("planend_date",DateUtil.formatDate(planend_date));
ja_new2.add(this.createDay(jo)); JSONObject jo_now = this.createDay(jo);
ja_new2.add(jo_now);
pcsn_num_day = totalproducecapacity_qty - pcsn_num; pcsn_num_day = totalproducecapacity_qty - pcsn_num;
if(pcsn_num_day <= 0){ if(pcsn_num_day <= 0){
date = DateUtil.offsetDay(date,1); date = DateUtil.offsetDay(date,1);
@@ -584,17 +588,17 @@ public class DailyplanServiceImpl implements DailyplanService {
} }
} }
//根据工作日和结束日期相同的天数进行更新开始日期dailyplan_id -> 1583321344530059264
//根据工作日和结束日期相同的天数进行更新开始日期
ja_new = new JSONArray(); ja_new = new JSONArray();
for (int i = 0; i < ja_new2.size(); i++) { for (int i = 0; i < ja_new2.size(); i++) {
JSONObject jo = ja_new2.getJSONObject(i); JSONObject jo = ja_new2.getJSONObject(i);
JSONObject jo_new = MPS_BD_ProductDailyPlan.query("dailyplan_id='"+jo.getString("dailyplan_id")+"' and status='01'").uniqueResult(0); JSONObject jo_new = MPS_BD_ProductDailyPlan.query("dailyplan_id='"+jo.getString("dailyplan_id")+"' and status='01'").uniqueResult(0);
if (jo_new!=null) { if (jo_new!=null) {
ja_new.add(jo); ja_new.add(jo);
MPS_BD_ProductDailyPlan.delete(jo); MPS_BD_ProductDailyPlan.delete("dailyplan_id='"+jo.getString("dailyplan_id")+"' and status='01'");
} }
} }
HashMap<String,JSONObject> map = new HashMap<String,JSONObject>(); HashMap<String,JSONObject> map = new HashMap<String,JSONObject>();
for(int i=0;i<ja_new.size();i++){ for(int i=0;i<ja_new.size();i++){
JSONObject jo = ja_new.getJSONObject(i); JSONObject jo = ja_new.getJSONObject(i);
@@ -662,29 +666,41 @@ public class DailyplanServiceImpl implements DailyplanService {
String nickName = SecurityUtils.getNickName(); String nickName = SecurityUtils.getNickName();
String now = DateUtil.now(); String now = DateUtil.now();
JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser(); JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser();
Long deptId = currentUser.getDeptId();
WQLObject pdm_bi_productdeptpcsn = WQLObject.getWQLObject("pdm_bi_productdeptpcsn"); WQLObject pdm_bi_productdeptpcsn = WQLObject.getWQLObject("pdm_bi_productdeptpcsn");
WQLObject MPS_BD_ProductDailyPlan = WQLObject.getWQLObject("MPS_BD_ProductDailyPlan"); WQLObject MPS_BD_ProductDailyPlan = WQLObject.getWQLObject("MPS_BD_ProductDailyPlan");
WQLObject MD_ME_ProducMaterialExt = WQLObject.getWQLObject("MD_ME_ProducMaterialExt"); // 工艺路线主表 JSONObject new_jo = new JSONObject();
// 插入主表 // 插入主表
json.put("dailyplan_id", IdUtil.getSnowflake(1, 1).nextId()); new_jo.put("dailyplan_id", IdUtil.getSnowflake(1, 1).nextId());
String workorder_code = CodeUtil.getNewCode("R_CODE"); String workorder_code = CodeUtil.getNewCode("R_CODE");
json.put("plan_code", workorder_code); new_jo.put("plan_code", workorder_code);
json.put("weight_unit_id", "1"); new_jo.put("weight_unit_id", "1");
json.put("weight_unit_name", "千克\\公斤"); new_jo.put("weight_unit_name", "千克\\公斤");
json.put("status", "01"); new_jo.put("status", "01");
json.put("create_id", currentUserId); new_jo.put("create_id", currentUserId);
json.put("create_name", nickName); new_jo.put("create_name", nickName);
json.put("create_time", now); new_jo.put("create_time", now);
new_jo.put("workorder_type", json.getString("workorder_type"));
new_jo.put("plan_id", json.getString("plan_id"));
new_jo.put("plan_org_code", json.getString("plan_org_code"));
new_jo.put("material_id", json.getString("material_id"));
new_jo.put("product_weight", json.getString("product_weight"));
new_jo.put("product_num", json.getString("product_num"));
new_jo.put("plan_finish_date", json.getString("plan_finish_date"));
new_jo.put("product_series_id", json.getString("product_series_id"));
new_jo.put("device_id", json.getString("device_id"));
new_jo.put("planstart_date", json.getString("planstart_date"));
new_jo.put("planend_date", json.getString("planend_date"));
new_jo.put("remark", json.getString("remark"));
JSONObject product = pdm_bi_productdeptpcsn.query("org_code='"+json.getString("plan_org_code")+"'").uniqueResult(0); JSONObject product = pdm_bi_productdeptpcsn.query("org_code='"+json.getString("plan_org_code")+"'").uniqueResult(0);
json.put("plan_org_name", product.getString("org_name")); new_jo.put("plan_org_name", product.getString("org_name"));
json.put("product_series", json.getString("product_series_id")); new_jo.put("product_series", json.getString("product_series_id"));
MPS_BD_ProductDailyPlan.insert(json); MPS_BD_ProductDailyPlan.insert(new_jo);
return json; return new_jo;
} }
@Override @Override

77
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java
View File

@@ -472,7 +472,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
jo.put("planend_date",DateUtil.formatDate(planend_date)); jo.put("planend_date",DateUtil.formatDate(planend_date));
ja_new2.add(this.createDay(jo)); JSONObject jo_now = this.createDay(jo);
ja_new2.add(jo_now);
date = DateUtil.offsetDay(date,1); date = DateUtil.offsetDay(date,1);
pcsn_num = pcsn_num - pcsn_num_day; pcsn_num = pcsn_num - pcsn_num_day;
@@ -487,7 +488,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
jo.put("planend_date",DateUtil.formatDate(planend_date)); jo.put("planend_date",DateUtil.formatDate(planend_date));
ja_new2.add(this.createDay(jo)); JSONObject jo_now = this.createDay(jo);
ja_new2.add(jo_now);
pcsn_num_day = pcsn_num_day - pcsn_num; pcsn_num_day = pcsn_num_day - pcsn_num;
if(pcsn_num_day <= 0){ if(pcsn_num_day <= 0){
@@ -509,7 +511,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
jo.put("planend_date",DateUtil.formatDate(planend_date)); jo.put("planend_date",DateUtil.formatDate(planend_date));
ja_new2.add(this.createDay(jo)); JSONObject jo_now = this.createDay(jo);
ja_new2.add(jo_now);
date = DateUtil.offsetDay(date,1); date = DateUtil.offsetDay(date,1);
pcsn_num = pcsn_num - totalproducecapacity_qty; pcsn_num = pcsn_num - totalproducecapacity_qty;
@@ -524,7 +527,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
jo.put("planend_date",DateUtil.formatDate(planend_date)); jo.put("planend_date",DateUtil.formatDate(planend_date));
ja_new2.add(this.createDay(jo)); JSONObject jo_now = this.createDay(jo);
ja_new2.add(jo_now);
pcsn_num_day = totalproducecapacity_qty - pcsn_num; pcsn_num_day = totalproducecapacity_qty - pcsn_num;
if(pcsn_num_day <= 0){ if(pcsn_num_day <= 0){
@@ -579,7 +583,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
jo.put("planend_date",DateUtil.formatDate(planend_date)); jo.put("planend_date",DateUtil.formatDate(planend_date));
ja_new2.add(this.createDay(jo)); JSONObject jo_now = this.createDay(jo);
ja_new2.add(jo_now);
date = DateUtil.offsetDay(date,1); date = DateUtil.offsetDay(date,1);
pcsn_num = pcsn_num - pcsn_num_day; pcsn_num = pcsn_num - pcsn_num_day;
@@ -594,7 +599,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
jo.put("planend_date",DateUtil.formatDate(planend_date)); jo.put("planend_date",DateUtil.formatDate(planend_date));
ja_new2.add(this.createDay(jo)); JSONObject jo_now = this.createDay(jo);
ja_new2.add(jo_now);
pcsn_num_day = pcsn_num_day - pcsn_num; pcsn_num_day = pcsn_num_day - pcsn_num;
if(pcsn_num_day <= 0){ if(pcsn_num_day <= 0){
@@ -617,7 +623,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
jo.put("planend_date",DateUtil.formatDate(planend_date)); jo.put("planend_date",DateUtil.formatDate(planend_date));
ja_new2.add(this.createDay(jo)); JSONObject jo_now = this.createDay(jo);
ja_new2.add(jo_now);
date = DateUtil.offsetDay(date,1); date = DateUtil.offsetDay(date,1);
pcsn_num =pcsn_num - totalproducecapacity_qty; pcsn_num =pcsn_num - totalproducecapacity_qty;
@@ -632,7 +639,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
jo.put("planend_date",DateUtil.formatDate(planend_date)); jo.put("planend_date",DateUtil.formatDate(planend_date));
ja_new2.add(this.createDay(jo)); JSONObject jo_now = this.createDay(jo);
ja_new2.add(jo_now);
pcsn_num_day = totalproducecapacity_qty - pcsn_num; pcsn_num_day = totalproducecapacity_qty - pcsn_num;
if(pcsn_num_day <= 0){ if(pcsn_num_day <= 0){
@@ -683,7 +691,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
jo.put("planend_date",DateUtil.formatDate(planend_date)); jo.put("planend_date",DateUtil.formatDate(planend_date));
ja_new2.add(this.createDay(jo)); JSONObject jo_now = this.createDay(jo);
ja_new2.add(jo_now);
date = DateUtil.offsetDay(date,1); date = DateUtil.offsetDay(date,1);
pcsn_num = pcsn_num - pcsn_num_day; pcsn_num = pcsn_num - pcsn_num_day;
@@ -698,7 +707,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
jo.put("planend_date",DateUtil.formatDate(planend_date)); jo.put("planend_date",DateUtil.formatDate(planend_date));
ja_new2.add(this.createDay(jo)); JSONObject jo_now = this.createDay(jo);
ja_new2.add(jo_now);
pcsn_num_day = pcsn_num_day - pcsn_num; pcsn_num_day = pcsn_num_day - pcsn_num;
if(pcsn_num_day <= 0){ if(pcsn_num_day <= 0){
@@ -720,7 +730,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
jo.put("planend_date",DateUtil.formatDate(planend_date)); jo.put("planend_date",DateUtil.formatDate(planend_date));
ja_new2.add(this.createDay(jo)); JSONObject jo_now = this.createDay(jo);
ja_new2.add(jo_now);
date = DateUtil.offsetDay(date,1); date = DateUtil.offsetDay(date,1);
pcsn_num = pcsn_num - totalproducecapacity_qty; pcsn_num = pcsn_num - totalproducecapacity_qty;
@@ -735,7 +746,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
jo.put("planend_date",DateUtil.formatDate(planend_date)); jo.put("planend_date",DateUtil.formatDate(planend_date));
ja_new2.add(this.createDay(jo)); JSONObject jo_now = this.createDay(jo);
ja_new2.add(jo_now);
pcsn_num_day = totalproducecapacity_qty - pcsn_num; pcsn_num_day = totalproducecapacity_qty - pcsn_num;
if(pcsn_num_day <= 0){ if(pcsn_num_day <= 0){
@@ -864,29 +876,40 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
String nickName = SecurityUtils.getNickName(); String nickName = SecurityUtils.getNickName();
String now = DateUtil.now(); String now = DateUtil.now();
JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser(); JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser();
Long deptId = currentUser.getDeptId();
WQLObject pdm_bi_productdeptpcsn = WQLObject.getWQLObject("pdm_bi_productdeptpcsn"); WQLObject pdm_bi_productdeptpcsn = WQLObject.getWQLObject("pdm_bi_productdeptpcsn");
WQLObject MPS_BD_ProductDailyPlan = WQLObject.getWQLObject("MPS_BD_ProductDailyPlan"); WQLObject MPS_BD_ProductDailyPlan = WQLObject.getWQLObject("MPS_BD_ProductDailyPlan");
WQLObject MD_ME_ProducMaterialExt = WQLObject.getWQLObject("MD_ME_ProducMaterialExt"); // 工艺路线主表 JSONObject new_jo = new JSONObject();
// 插入主表 // 插入主表
json.put("dailyplan_id", IdUtil.getSnowflake(1, 1).nextId()); new_jo.put("dailyplan_id", IdUtil.getSnowflake(1, 1).nextId());
String workorder_code = CodeUtil.getNewCode("R_CODE"); String workorder_code = CodeUtil.getNewCode("R_CODE");
json.put("plan_code", workorder_code); new_jo.put("plan_code", workorder_code);
json.put("workorder_type", "01"); new_jo.put("weight_unit_id", "1");
json.put("weight_unit_id", "1"); new_jo.put("weight_unit_name", "千克\\公斤");
json.put("weight_unit_name", "千克\\公斤"); new_jo.put("status", "01");
json.put("status", "01"); new_jo.put("create_id", currentUserId);
json.put("create_id", currentUserId); new_jo.put("create_name", nickName);
json.put("create_name", nickName); new_jo.put("create_time", now);
json.put("create_time", now);
new_jo.put("workorder_type", json.getString("workorder_type"));
new_jo.put("plan_id", json.getString("plan_id"));
new_jo.put("plan_org_code", json.getString("plan_org_code"));
new_jo.put("material_id", json.getString("material_id"));
new_jo.put("product_weight", json.getString("product_weight"));
new_jo.put("product_num", json.getString("product_num"));
new_jo.put("plan_finish_date", json.getString("plan_finish_date"));
new_jo.put("product_series_id", json.getString("product_series_id"));
new_jo.put("device_id", json.getString("device_id"));
new_jo.put("planstart_date", json.getString("planstart_date"));
new_jo.put("planend_date", json.getString("planend_date"));
new_jo.put("remark", json.getString("remark"));
JSONObject product = pdm_bi_productdeptpcsn.query("org_code='"+json.getString("plan_org_code")+"'").uniqueResult(0); JSONObject product = pdm_bi_productdeptpcsn.query("org_code='"+json.getString("plan_org_code")+"'").uniqueResult(0);
json.put("plan_org_name", product.getString("org_name")); new_jo.put("plan_org_name", product.getString("org_name"));
json.put("product_series", json.getString("product_series_id")); new_jo.put("product_series", json.getString("product_series_id"));
MPS_BD_ProductDailyPlan.insert(json); MPS_BD_ProductDailyPlan.insert(new_jo);
return json; return new_jo;
} }
} }

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
View File

@@ -725,6 +725,7 @@ public class FormulaServiceImpl implements FormulaService {
WQLObject paraTab = WQLObject.getWQLObject("PDM_BI_WorkProcedureParaProduct"); // 工艺参数表 WQLObject paraTab = WQLObject.getWQLObject("PDM_BI_WorkProcedureParaProduct"); // 工艺参数表
WQLObject workTaskTab = WQLObject.getWQLObject("PDM_BI_WorkTask"); // 工令工序任务表 WQLObject workTaskTab = WQLObject.getWQLObject("PDM_BI_WorkTask"); // 工令工序任务表
WQLObject classTab = WQLObject.getWQLObject("md_pb_classstandard"); // 分类表 WQLObject classTab = WQLObject.getWQLObject("md_pb_classstandard"); // 分类表
WQLObject deviceTab = WQLObject.getWQLObject("em_bi_deviceinfo"); // 设备表
JSONObject jsonMst = formMstTab.query("formula_id ='" + formula_id + "'").uniqueResult(0); JSONObject jsonMst = formMstTab.query("formula_id ='" + formula_id + "'").uniqueResult(0);
String material_id = jsonMst.getString("material_id"); String material_id = jsonMst.getString("material_id");
@@ -859,8 +860,9 @@ public class FormulaServiceImpl implements FormulaService {
map2.put("flag", "5"); map2.put("flag", "5");
map2.put("product_series_id", jsonMst.getString("product_series_id")); map2.put("product_series_id", jsonMst.getString("product_series_id"));
map2.put("workprocedure_id", "1472449923327856640"); map2.put("workprocedure_id", "1472449923327856640");
JSONObject jsonDevice3= WQL.getWO("QPF_POINTCARD01").addParamMap(map2).process().uniqueResult(0); // JSONObject jsonDevice3= WQL.getWO("QPF_POINTCARD01").addParamMap(map2).process().uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonDevice3)) oneMap.put("device2",jsonDevice3.getString("device_name")); JSONObject jsonDevice = deviceTab.query("device_id = '" + jsonWork.getString("device_id") + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonDevice)) oneMap.put("device2",jsonDevice.getString("device_name"));
// 球磨 // 球磨

90
mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue
View File

@@ -145,33 +145,30 @@
> >
生成工令 生成工令
</el-button> </el-button>
<el-button
slot="right"
class="filter-item"
type="primary"
icon="el-icon-top"
size="mini"
@click="moveUp2"
>
上移
</el-button>
<el-button
slot="right"
class="filter-item"
type="primary"
icon="el-icon-bottom"
size="mini"
@click="moveDown2"
>
下移
</el-button>
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :max-height="590" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" highlight-current-row :max-height="590" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler" @current-change="handleDtlCurrentChange">
<el-table-column
min-width="115"
label="重排调整"
align="center"
fixed="right"
>
<template slot-scope="scope">
<el-button
type="primary"
size="mini"
icon="el-icon-top"
@click="moveUp(scope.$index, scope.row)"
>
</el-button>
<el-button
type="primary"
size="mini"
icon="el-icon-bottom"
@click="moveDown(scope.$index, scope.row)"
>
</el-button>
</template>
</el-table-column>
<el-table-column <el-table-column
v-permission="['admin','workorder:del','workorder:edit']" v-permission="['admin','workorder:del','workorder:edit']"
min-width="125" min-width="125"
@@ -189,6 +186,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="left" :selectable="checkboxT" type="selection" min-width="35" /> <el-table-column fixed="left" :selectable="checkboxT" type="selection" min-width="35" />
<el-table-column type="index" label="序号" min-width="40" align="center" />
<el-table-column prop="plan_code" label="日计划编码" min-width="105" /> <el-table-column prop="plan_code" label="日计划编码" min-width="105" />
<el-table-column :formatter="seriesFormat" min-width="70" prop="product_series_id" label="系列产线" /> <el-table-column :formatter="seriesFormat" min-width="70" prop="product_series_id" label="系列产线" />
<el-table-column prop="device_name" label="关键设备" min-width="80" /> <el-table-column prop="device_name" label="关键设备" min-width="80" />
@@ -272,6 +270,7 @@ export default {
XLList: [], XLList: [],
fileList: [], fileList: [],
checkrows: [], checkrows: [],
now_row: null,
form: {}, form: {},
rules: { rules: {
}} }}
@@ -299,6 +298,7 @@ export default {
}, },
methods: { methods: {
[CRUD.HOOK.beforeRefresh]() { [CRUD.HOOK.beforeRefresh]() {
this.now_row = null
return true return true
}, },
checkboxT(row) { checkboxT(row) {
@@ -399,6 +399,48 @@ export default {
this.crud.loading = false this.crud.loading = false
}) })
}, },
handleDtlCurrentChange(current) {
if (current !== null) {
this.now_row = current
} else {
this.now_row = null
}
},
moveUp2() {
if (this.now_row === null) {
return this.crud.notify('请选中一条数据！')
}
const data = this.crud.data
for (let i = 0; i < data.length; i++) {
if (data[i].plan_code === this.now_row.plan_code) {
if (i > 0) {
const upDate = this.crud.data[i - 1]
this.crud.data.splice(i - 1, 1)
this.crud.data.splice(i, 0, upDate)
} else {
this.$message.error('已经是第一条，不可上移')
}
}
}
},
moveDown2() {
if (this.now_row === null) {
return this.crud.notify('请选中一条数据！')
}
const data = this.crud.data
for (let i = 0; i < data.length; i++) {
if (data[i].plan_code === this.now_row.plan_code) {
if ((i + 1) === this.crud.data.length) {
this.$message.error('已经是最后一条，不可下移')
} else {
const downDate = this.crud.data[i + 1]
this.crud.data.splice(i + 1, 1)
this.crud.data.splice(i, 0, downDate)
break
}
}
}
},
querytable() { querytable() {
this.crud.toQuery() this.crud.toQuery()
} }