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

优化

Browse Source
This commit is contained in:
zds
2022-10-21 13:58:22 +08:00
parent 5f4e1f6cc2
commit c418d0267b
2 changed files with 88 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);
if (jo_new!=null) {
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);
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);
pcsn_num = pcsn_num - pcsn_num_day;
@@ -537,7 +538,8 @@ public class DailyplanServiceImpl implements DailyplanService {
Date planend_date = DateUtil.offsetDay(date,days-1);
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;
if(pcsn_num_day <= 0){
@@ -559,7 +561,8 @@ public class DailyplanServiceImpl implements DailyplanService {
Date planend_date = DateUtil.offsetDay(date,days-1);
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);
pcsn_num =pcsn_num - totalproducecapacity_qty;
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);
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;
if(pcsn_num_day <= 0){
date = DateUtil.offsetDay(date,1);
@@ -584,17 +588,17 @@ public class DailyplanServiceImpl implements DailyplanService {
}
}
//根据工作日和结束日期相同的天数进行更新开始日期
//根据工作日和结束日期相同的天数进行更新开始日期dailyplan_id -> 1583321344530059264
ja_new = new JSONArray();
for (int i = 0; i < ja_new2.size(); 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);
if (jo_new!=null) {
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>();
for(int i=0;i<ja_new.size();i++){
JSONObject jo = ja_new.getJSONObject(i);
@@ -662,29 +666,41 @@ public class DailyplanServiceImpl implements DailyplanService {
String nickName = SecurityUtils.getNickName();
String now = DateUtil.now();
JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser();
Long deptId = currentUser.getDeptId();
WQLObject pdm_bi_productdeptpcsn = WQLObject.getWQLObject("pdm_bi_productdeptpcsn");
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");
json.put("plan_code", workorder_code);
json.put("weight_unit_id", "1");
json.put("weight_unit_name", "千克\\公斤");
json.put("status", "01");
json.put("create_id", currentUserId);
json.put("create_name", nickName);
json.put("create_time", now);
new_jo.put("plan_code", workorder_code);
new_jo.put("weight_unit_id", "1");
new_jo.put("weight_unit_name", "千克\\公斤");
new_jo.put("status", "01");
new_jo.put("create_id", currentUserId);
new_jo.put("create_name", nickName);
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);
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"));
MPS_BD_ProductDailyPlan.insert(json);
return json;
new_jo.put("product_series", json.getString("product_series_id"));
MPS_BD_ProductDailyPlan.insert(new_jo);
return new_jo;
}
@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);
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);
pcsn_num = pcsn_num - pcsn_num_day;
@@ -487,7 +488,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1);
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;
if(pcsn_num_day <= 0){
@@ -509,7 +511,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1);
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);
pcsn_num = pcsn_num - totalproducecapacity_qty;
@@ -524,7 +527,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1);
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;
if(pcsn_num_day <= 0){
@@ -579,7 +583,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1);
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);
pcsn_num = pcsn_num - pcsn_num_day;
@@ -594,7 +599,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1);
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;
if(pcsn_num_day <= 0){
@@ -617,7 +623,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1);
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);
pcsn_num =pcsn_num - totalproducecapacity_qty;
@@ -632,7 +639,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1);
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;
if(pcsn_num_day <= 0){
@@ -683,7 +691,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1);
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);
pcsn_num = pcsn_num - pcsn_num_day;
@@ -698,7 +707,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1);
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;
if(pcsn_num_day <= 0){
@@ -720,7 +730,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1);
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);
pcsn_num = pcsn_num - totalproducecapacity_qty;
@@ -735,7 +746,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
Date planend_date = DateUtil.offsetDay(date,days-1);
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;
if(pcsn_num_day <= 0){
@@ -864,29 +876,40 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
String nickName = SecurityUtils.getNickName();
String now = DateUtil.now();
JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser();
Long deptId = currentUser.getDeptId();
WQLObject pdm_bi_productdeptpcsn = WQLObject.getWQLObject("pdm_bi_productdeptpcsn");
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");
json.put("plan_code", workorder_code);
json.put("workorder_type", "01");
json.put("weight_unit_id", "1");
json.put("weight_unit_name", "千克\\公斤");
json.put("status", "01");
json.put("create_id", currentUserId);
json.put("create_name", nickName);
json.put("create_time", now);
new_jo.put("plan_code", workorder_code);
new_jo.put("weight_unit_id", "1");
new_jo.put("weight_unit_name", "千克\\公斤");
new_jo.put("status", "01");
new_jo.put("create_id", currentUserId);
new_jo.put("create_name", nickName);
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);
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"));
MPS_BD_ProductDailyPlan.insert(json);
return json;
new_jo.put("product_series", json.getString("product_series_id"));
MPS_BD_ProductDailyPlan.insert(new_jo);
return new_jo;
}
}