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-08-31 11:14:14 +08:00
parent 03319598dd
commit 66633e0657
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls
View File

Binary file not shown.

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

@@ -345,14 +345,14 @@ public class DailyplanServiceImpl implements DailyplanService {
//第一条查数据库
if(StrUtil.isNotEmpty(nowstart_date)){
JSONObject last2 = MPS_BD_ProductDailyPlan.query("device_id='"+jo.getString("device_id")+"'","planstart_date desc,create_time desc").uniqueResult(0);
String old_mark = jo.getString("old_mark");
String standard_mark = jo.getString("standard_mark");
if(last2 != null ){
nowstart_date = last2.getString("planstart_date");
date = DateUtil.parse(nowstart_date);
JSONObject mater = MD_ME_ProducMaterialExt.query("material_id='"+last2.getString("material_id")+"'").uniqueResult(0);
old_mark = mater.getString("old_mark");
standard_mark = mater.getString("standard_mark");
}
if(jo.getString("old_mark").equals(old_mark)) {
if(jo.getString("standard_mark").equals(standard_mark)) {
JSONObject total_last = WQL.getWO("QPDM_PRODUCTPLANPROC")
.addParam("flag", "6")
.addParam("device_id", jo.getString("device_id"))

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

@@ -350,8 +350,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
double a = Double.parseDouble(s1.replace("-",""));
double b = Double.parseDouble(o2.getString("plan_finish_date").replace("-",""));
String s1_old_mark = o1.getString("old_mark");
String s2_old_mark = o2.getString("old_mark");
String s1_standard_mark = o1.getString("standard_mark");
String s2_standard_mark= o2.getString("standard_mark");
String s1_material_code = o1.getString("material_code");
String s2_material_code = o2.getString("material_code");
@@ -359,9 +359,9 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
if (a > b) { //降序排列，升序改成a>b
return 1;
} else if(a == b) {
if (s1_old_mark.compareTo(s2_old_mark)>0) { //降序排列，升序改成a>b
if (s1_standard_mark.compareTo(s2_standard_mark)>0) { //降序排列，升序改成a>b
return 1;
} else if(s1_old_mark.compareTo(s2_old_mark) == 0) {
} else if(s1_standard_mark.compareTo(s2_standard_mark) == 0) {
if (s1_material_code.compareTo(s2_material_code)>0) { //降序排列，升序改成a>b
return 1;
@@ -436,7 +436,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
//若初始日期不为空，取此初始日期
if(finalChecked.equals("true")){
JSONObject last = jo_before;
if(last!=null && jo.getString("old_mark").equals(last.getString("old_mark"))) {
if(last!=null && jo.getString("standard_mark").equals(last.getString("standard_mark"))) {
JSONObject total_last = WQL.getWO("QPDM_PRODUCTPLANPROC")
.addParam("flag", "6")
.addParam("device_id", jo.getString("device_id"))
@@ -542,9 +542,9 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
throw new BadRequestException("日计划表此分组设备的最后一个计划为空！");
}
JSONObject mater = MD_ME_ProducMaterialExt.query("material_id='"+last.getString("material_id")+"'").uniqueResult(0);
String old_mark = mater.getString("old_mark");
String standard_mark = mater.getString("standard_mark");
if(jo.getString("old_mark").equals(old_mark)) {
if(jo.getString("standard_mark").equals(standard_mark)) {
JSONObject total_last = WQL.getWO("QPDM_PRODUCTPLANPROC")
.addParam("flag", "6")
.addParam("device_id", jo.getString("device_id"))
@@ -646,9 +646,9 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService {
throw new BadRequestException("日计划表此分组设备的最后一个计划为空！");
}
JSONObject mater = MD_ME_ProducMaterialExt.query("material_id='"+last.getString("material_id")+"'").uniqueResult(0);
String old_mark = mater.getString("old_mark");
String standard_mark = mater.getString("standard_mark");
if(jo.getString("old_mark").equals(old_mark)) {
if(jo.getString("standard_mark").equals(standard_mark)) {
JSONObject total_last = WQL.getWO("QPDM_PRODUCTPLANPROC")
.addParam("flag", "6")
.addParam("device_id", jo.getString("device_id"))

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql
View File

@@ -53,6 +53,7 @@
SELECT
pp.*,
ext.old_mark,
ext.standard_mark,
ext.product_series AS mater_product_series,
ext.standard_weight_pft AS standard_weight,
materialbase.material_code,
@@ -99,6 +100,7 @@
SELECT
pp.*,
ext.old_mark,
ext.standard_mark,
ext.product_series AS mater_product_series,
ext.standard_weight_pft AS standard_weight,
materialbase.material_code,

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql
View File

@@ -54,6 +54,7 @@
SELECT
pp.*,
ext.old_mark,
ext.standard_mark,
ext.standard_weight_pft AS standard_weight
FROM
PCS_IF_ProductPlanProc pp
@@ -87,6 +88,7 @@
SELECT
pp.*,
ext.old_mark,
ext.standard_mark,
ext.standard_weight_pft AS standard_weight,
materialbase.material_type_id,
ext.product_series,