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-11-18 19:39:18 +08:00
parent f80cbedd79
commit 1918282cf5
6 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java
View File

@@ -99,7 +99,7 @@ public class GenCodeServiceImpl implements GenCodeService {
//如果flag=1就执行更新数据库的操作 //如果flag=1就执行更新数据库的操作
String flag = (String) form.get("flag"); String flag = (String) form.get("flag");
WQLObject wo = WQLObject.getWQLObject("sys_code_rule_detail"); WQLObject wo = WQLObject.getWQLObject("sys_code_rule_detail");
JSONArray ja = wo.query("code_rule_id = '" + id + "' FOR UPDATE").getResultJSONArray(0); JSONArray ja = wo.query("code_rule_id = '" + id + "'", " sort_num,type FOR UPDATE").getResultJSONArray(0);
String demo = ""; String demo = "";
boolean is_same = true; boolean is_same = true;
for (int i = 0; i < ja.size(); i++) { for (int i = 0; i < ja.size(); i++) {
@@ -174,7 +174,7 @@ public class GenCodeServiceImpl implements GenCodeService {
//如果flag=1就执行更新数据库的操作 //如果flag=1就执行更新数据库的操作
String flag = (String) form.get("flag"); String flag = (String) form.get("flag");
WQLObject wo = WQLObject.getWQLObject("sys_code_rule_detail"); WQLObject wo = WQLObject.getWQLObject("sys_code_rule_detail");
JSONArray ja = wo.query("code_rule_id = '" + id + "' FOR UPDATE").getResultJSONArray(0); JSONArray ja = wo.query("code_rule_id = '" + id + "'", " sort_num,type FOR UPDATE").getResultJSONArray(0);
String demo = ""; String demo = "";
boolean is_same = true; boolean is_same = true;
for (int i = 0; i < ja.size(); i++) { for (int i = 0; i < ja.size(); i++) {

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java
View File

@@ -547,9 +547,6 @@ public class InspectionsheetmstServiceImpl implements InspectionsheetmstService
if (jsonIvt.getDoubleValue("canuse_qty") != jsonIvt.getDoubleValue("ivt_qty")) { if (jsonIvt.getDoubleValue("canuse_qty") != jsonIvt.getDoubleValue("ivt_qty")) {
throw new BadRequestException("此批次物料有未完成的单据"); throw new BadRequestException("此批次物料有未完成的单据");
} }
if (jsonDtl.getString("result").equals(jsonIvt.getString("quality_scode"))) {
continue;
}
JSONObject prarm = new JSONObject(); JSONObject prarm = new JSONObject();
String change_type_scode = ""; String change_type_scode = "";
prarm.put("struct_id", jsonIvt.getString("struct_id")); prarm.put("struct_id", jsonIvt.getString("struct_id"));

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java
View File

@@ -986,8 +986,8 @@ public class PhysicalMstServiceImpl implements PhysicalMstService {
for (int i = 0; i < dataArr.size(); i++) { for (int i = 0; i < dataArr.size(); i++) {
JSONObject json = dataArr.getJSONObject(i); JSONObject json = dataArr.getJSONObject(i);
JSONObject jsonPhyMst = phyMstTab.query("inspection_id = '"+json.getString("inspection_id")+"'").uniqueResult(0); JSONObject jsonPhyMst = phyMstTab.query("inspection_id = '"+json.getString("inspection_id")+"'").uniqueResult(0);
if (StrUtil.equals(jsonPhyMst.getString("bill_status"), "99") && StrUtil.equals(jsonPhyMst.getString("is_effective"), "`99`")) { if (StrUtil.equals(jsonPhyMst.getString("bill_status"), "99")) {
throw new BadRequestException("此理化报告：" + jsonPhyMst.getString("inspection_code") + "已完成且有效"); throw new BadRequestException("此理化报告：" + jsonPhyMst.getString("inspection_code") + "已完成");
} }
// 1.将wms物料id转换成本erp物料id // 1.将wms物料id转换成本erp物料id

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

@@ -77,7 +77,7 @@
OPTION 输入.pcsn <> "" OPTION 输入.pcsn <> ""
pcsn = 输入.pcsn pcsn = 输入.pcsn
ENDOPTION ENDOPTION
order by confirm_time desc order by BIZ_DATE desc
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF

10
mes/qd/src/views/wms/pf/formula/DivDialog.vue
View File

@@ -331,6 +331,7 @@
type="primary" class="filter-item" type="primary" class="filter-item"
size="mini" size="mini"
icon="el-icon-top" icon="el-icon-top"
:disabled="scope.row.status!='10'"
@click="moveUp(scope.$index, scope.row)" @click="moveUp(scope.$index, scope.row)"
> >
</el-button> </el-button>
@@ -338,6 +339,7 @@
type="primary" class="filter-item" type="primary" class="filter-item"
size="mini" size="mini"
icon="el-icon-bottom" icon="el-icon-bottom"
:disabled="scope.row.status!='10'"
@click="moveDown(scope.$index, scope.row)" @click="moveDown(scope.$index, scope.row)"
> >
</el-button> </el-button>
@@ -488,8 +490,12 @@ export default {
moveUp(index, item) { moveUp(index, item) {
if (index > 0) { if (index > 0) {
const upDate = this.tableDtl[index - 1] const upDate = this.tableDtl[index - 1]
this.tableDtl.splice(index - 1, 1) if(upDate.status != '10'){
this.tableDtl.splice(index, 0, upDate) this.$message.error('上一个明细是生产中、完成状态，不可上移')
}else{
this.tableDtl.splice(index - 1, 1)
this.tableDtl.splice(index, 0, upDate)
}
} else { } else {
this.$message.error('已经是第一条，不可上移') this.$message.error('已经是第一条，不可上移')
} }

4
mes/qd/src/views/wms/ql/physicalMstConfirm/index.vue
View File

@@ -133,7 +133,7 @@
> >
确认 确认
</el-button> </el-button>
<el-button <!-- <el-button
slot="right" slot="right"
class="filter-item" class="filter-item"
type="warning" type="warning"
@@ -143,7 +143,7 @@
@click="setValid" @click="setValid"
> >
设置有效 设置有效
</el-button> </el-button>-->
<el-button <el-button
slot="right" slot="right"
class="filter-item" class="filter-item"