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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-12-05 11:43:18 +08:00
parent 7ec52b45c8
commit f8144305f2
15 changed files with 93 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java
View File

@@ -168,10 +168,10 @@ public class UserController {
String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getOldPass());
String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getNewPass());
UserDto user = userService.findByName(SecurityUtils.getCurrentUsername());
if (!SaSecureUtil.md5BySalt(user.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(oldPass, "salt"))) {
if (!user.getPassword().equals(SaSecureUtil.md5BySalt(oldPass, "salt"))) {
throw new BadRequestException("修改失败，旧密码错误");
}
if (!SaSecureUtil.md5BySalt(user.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(newPass, "salt"))) {
if (user.getPassword().equals(SaSecureUtil.md5BySalt(newPass, "salt"))) {
throw new BadRequestException("新密码不能与旧密码相同");
}
userService.updatePass(user.getUsername(),SaSecureUtil.md5BySalt(newPass, "salt"));

18
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
View File

@@ -70,7 +70,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
} catch (Exception e) {
throw new BadRequestException(e.getMessage());
throw new BadRequestException("MES提示错误："+e.getMessage());
}
return result;
}
@@ -113,7 +113,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
} catch (Exception e) {
throw new BadRequestException(e.getMessage());
throw new BadRequestException("MES提示错误："+e.getMessage());
}
return result;
}
@@ -156,7 +156,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
} catch (Exception e) {
throw new BadRequestException(e.getMessage());
throw new BadRequestException("MES提示错误："+e.getMessage());
}
return result;
}
@@ -200,7 +200,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
} catch (Exception e) {
throw new BadRequestException(e.getMessage());
throw new BadRequestException("MES提示错误："+e.getMessage());
}
return result;
}
@@ -250,7 +250,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
} catch (Exception e) {
throw new BadRequestException(e.getMessage());
throw new BadRequestException("MES提示错误："+e.getMessage());
}
return result;
}
@@ -311,7 +311,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
} catch (Exception e) {
throw new BadRequestException(e.getMessage());
throw new BadRequestException("MES提示错误："+e.getMessage());
}
return result;
}
@@ -362,7 +362,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
} catch (Exception e) {
throw new BadRequestException(e.getMessage());
throw new BadRequestException("MES提示错误："+e.getMessage());
}
return result;
}
@@ -413,7 +413,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
String RTYPE = result.getString("RTYPE");
if (RTYPE.equals("E")){
throw new BadRequestException("MES提示错误："+result.getString("RTMSG"));
throw new BadRequestException(result.getString("RTMSG"));
}
@@ -458,7 +458,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
String RTYPE = result.getString("RTYPE");
if (RTYPE.equals("E")){
throw new BadRequestException("MES提示错误："+result.getString("RTMSG"));
throw new BadRequestException(result.getString("RTMSG"));
}

4
lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java
View File

@@ -67,7 +67,7 @@ public class LmsToSapServiceImpl implements LmsToSapService {
String type = result.getString("TYPE");
if (StrUtil.equals(type, "E")) {
throw new BadRequestException("SAP提示错误："+result.getString("MESSAGE"));
throw new BadRequestException(result.getString("MESSAGE"));
}
} catch (Exception e) {
@@ -131,7 +131,7 @@ public class LmsToSapServiceImpl implements LmsToSapService {
String type = result.getString("TYPE");
if (StrUtil.equals(type, "E")) {
throw new BadRequestException("SAP提示错误："+result.getString("MESSAGE"));
throw new BadRequestException(result.getString("MESSAGE"));
}
} catch (Exception e) {

8
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/eum/RegionTypeEnum.java
View File

@@ -9,10 +9,10 @@ public enum RegionTypeEnum {
B_FQ("06","B分切区","1587360208328462336"),
C_FQ("07","C分切区","1587360496145797120"),
D_FQ("08","D分切区","1587360569458036736"),
A_HKZC("09","A烘烤暂存区","1578657813205487616"),
B_HKZC("10","B烘烤暂存区","1587360656355627008"),
C_HKZC("11","C烘烤暂存区","1587360700223852544"),
D_HKZC("12","D烘烤暂存区","1587360741864902656"),
A_HKZC("09","A1烘烤暂存区","1578657813205487616"),
B_HKZC("10","A2烘烤暂存区","1587360656355627008"),
C_HKZC("11","A3烘烤暂存区","1587360700223852544"),
D_HKZC("12","A4烘烤暂存区","1587360741864902656"),
ZC01("13","主存区","1582991348217286656"),
KTP01("14","空托盘区","1582991511971303424"),
ZZ01("15","中转区","1582995342054526976"),

16
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
View File

@@ -122,16 +122,16 @@ public class BakingServiceImpl implements BakingService {
String reging_id = "";
switch (product_area) {
case "A":
case "A1":
reging_id = RegionTypeEnum.A_HKZC.getId();
break;
case "B":
case "A2":
reging_id = RegionTypeEnum.B_HKZC.getId();
break;
case "C":
case "A3":
reging_id = RegionTypeEnum.C_HKZC.getId();
break;
case "D":
case "A4":
reging_id = RegionTypeEnum.D_HKZC.getId();
break;
}
@@ -247,16 +247,16 @@ public class BakingServiceImpl implements BakingService {
String product_area = jsonHotIvt.getString("product_area");
String reging_id = "";
switch (product_area) {
case "A":
case "A1":
reging_id = RegionTypeEnum.A_HKZC.getId();
break;
case "B":
case "A2":
reging_id = RegionTypeEnum.B_HKZC.getId();
break;
case "C":
case "A3":
reging_id = RegionTypeEnum.C_HKZC.getId();
break;
case "D":
case "A4":
reging_id = RegionTypeEnum.D_HKZC.getId();
break;
}

6
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java
View File

@@ -56,10 +56,10 @@ public class RawFoilServiceImpl implements RawFoilService {
map.put("container_name", container_name);
map.put("product_area", product_area);
// 如果都为空则默认区域为 A
/*// 如果都为空则默认区域为 A1
if (ObjectUtil.isEmpty(point_code) && ObjectUtil.isEmpty(container_name) && ObjectUtil.isEmpty(product_area)) {
map.put("product_area", "A");
}
map.put("product_area", "A1");
}*/
JSONArray arr = WQL.getWO("PDA_RAWFOIL_01").addParamMap(map).process().getResultJSONArray(0);
for (int i = 0; i < arr.size(); i++) {

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java
View File

@@ -180,7 +180,7 @@ public class ShippingServiceImpl implements ShippingService {
}
//根据起点判断区域查询对应的输送线空点位
JSONObject point_jo = WQL.getWO("PDA_02").addParam("flag","4").addParam("product_area","A").process().uniqueResult(0);
JSONObject point_jo = WQL.getWO("PDA_02").addParam("flag","4").addParam("product_area","A1").process().uniqueResult(0);
//下发输送线任务
JSONObject form = new JSONObject();
form.put("point_code1",point_code);

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java
View File

@@ -46,10 +46,10 @@ public class CoolCutTask extends AbstractAcsTask {
String product_area = json.getString("product_area");
String agv_system_type = "";
if (product_area.equals("A")||product_area.equals("B")){
if (product_area.equals("A1")||product_area.equals("A2")){
agv_system_type = "2";
}
if (product_area.equals("C")||product_area.equals("D")){
if (product_area.equals("A3")||product_area.equals("A4")){
agv_system_type = "3";
}
AcsTaskDto dto = AcsTaskDto.builder()

4
lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
View File

@@ -167,7 +167,7 @@
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<!-- <el-button
<el-button
slot="right"
class="filter-item"
type="success"
@@ -176,7 +176,7 @@
@click="downdtl"
>
导出Excel
</el-button>-->
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="1000px">

17
lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue
View File

@@ -129,10 +129,23 @@
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
<el-input v-model="form.point_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="生产区域">
<el-input v-model="form.product_area" style="width: 370px;" :disabled="true" />
<el-select
v-model="form.product_area"
size="mini"
placeholder="生产区域"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.product_area"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />

27
lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue
View File

@@ -91,16 +91,29 @@
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
<el-input v-model="form.point_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="满轴位编码">
<el-input v-model="form.full_point_code" style="width: 370px;" :disabled="true" />
<el-input v-model="form.full_point_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="母卷号">
<el-input v-model="form.container_name" style="width: 370px;" :disabled="true" />
<el-input v-model="form.container_name" style="width: 370px;"/>
</el-form-item>
<el-form-item label="生产区域">
<el-input v-model="form.product_area" style="width: 370px;" :disabled="true" />
<el-select
v-model="query.product_area"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
>
<el-option
v-for="item in dict.product_area"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
@@ -166,11 +179,7 @@
</template>
</el-table-column>
<el-table-column prop="empty_vehicle_code" label="空轴编码" />
<el-table-column prop="product_area" label="生产区域">
<template slot-scope="scope">
{{ dict.label.product_area[scope.row.product_area] }}
</template>
</el-table-column>
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="point_location" label="位置">
<template slot-scope="scope">
{{ dict.label.point_location[scope.row.point_location] }}

6
lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue
View File

@@ -74,7 +74,7 @@
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
<el-input v-model="form.point_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="生产区域">
<el-select
@@ -83,7 +83,6 @@
placeholder="生产区域"
class="filter-item"
style="width: 370px;"
:disabled="true"
>
<el-option
v-for="item in dict.product_area"
@@ -120,7 +119,6 @@
placeholder="位置"
class="filter-item"
style="width: 370px;"
:disabled="true"
>
<el-option
v-for="item in dict.point_location"
@@ -130,7 +128,7 @@
</el-select>
</el-form-item>
<el-form-item label="顺序号" prop="sort_seq">
<el-input v-model="form.sort_seq" style="width: 370px;" :disabled="true" />
<el-input v-model="form.sort_seq" style="width: 370px;"/>
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />

23
lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue
View File

@@ -85,7 +85,23 @@
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
<el-input v-model="form.point_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="生产区域">
<el-select
v-model="query.product_area"
clearable
filterable
size="mini"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.product_area"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="点位状态" prop="point_status">
<el-select
@@ -104,10 +120,7 @@
</el-select>
</el-form-item>
<el-form-item label="母卷号">
<el-input v-model="form.container_name" style="width: 370px;" :disabled="true" />
</el-form-item>
<el-form-item label="批次">
<el-input v-model="form.pcsn" style="width: 370px;" :disabled="true" />
<el-input v-model="form.container_name" style="width: 370px;"/>
</el-form-item>
<el-form-item label="温度">
<el-input v-model="form.temperature" style="width: 370px;" />

9
lms/nladmin-ui/src/views/wms/pdm/ivt/sbpointivt/index.vue
View File

@@ -57,10 +57,10 @@
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
<el-input v-model="form.point_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="载具编码">
<el-input v-model="form.vehicle_code" style="width: 370px;" :disabled="true" />
<el-input v-model="form.vehicle_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="生产区域">
<el-select
@@ -69,7 +69,7 @@
placeholder="生产区域"
class="filter-item"
style="width: 370px;"
:disabled="true"
>
<el-option
v-for="item in dict.product_area"
@@ -85,7 +85,6 @@
placeholder="位置"
class="filter-item"
style="width: 370px;"
:disabled="true"
>
<el-option
v-for="item in dict.point_location"
@@ -95,7 +94,7 @@
</el-select>
</el-form-item>
<el-form-item label="外部编码">
<el-input v-model="form.ext_code" style="width: 370px;" :disabled="true" />
<el-input v-model="form.ext_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />

4
lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
View File

@@ -106,7 +106,7 @@
@current-change="handleDtlCurrentChange"
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="bill_code" label="出库单号" align="center" />
<el-table-column prop="bill_code" label="出库单号" align="center" width="100"/>
<el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
@@ -115,6 +115,8 @@
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" />
<el-table-column prop="source_bill_code" label="源单号" align="center" width="130px" />
<el-table-column prop="vbeln" label="交货单号" align="center" width="130px" />
<el-table-column prop="posnr" label="交货单行号" align="center" width="130px" />
<el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
</el-table>
</el-card>