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

opt: 1

Browse Source
This commit is contained in:
liyongde
2025-10-27 19:22:39 +08:00
parent 81bf4e4786
commit b5e29616c3
6 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PdmBdWorkorderMapper.xml
View File

@@ -59,7 +59,8 @@
ss.struct_code,
mm.material_code,
mm.material_name,
mm.material_spec
mm.material_spec,
ss.stor_code
FROM
`md_pb_groupplate` mg
LEFT JOIN st_ivt_structattr ss ON ss.storagevehicle_code = mg.storagevehicle_code

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/GroupPlate.java
View File

@@ -125,5 +125,7 @@ public class GroupPlate implements Serializable {
private String material_name;
@TableField(exist = false)
private String material_spec;
@TableField(exist = false)
private String stor_code;
}

34
lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
View File

@@ -88,7 +88,7 @@
</appender>
<!--开发环境:打印控制台-->
<springProfile name="dev">
<springProfile name="prod">
<root level="info">
<appender-ref ref="asyncFileAppender"/>
<appender-ref ref="asyncLuceneAppender"/>
@@ -120,45 +120,33 @@
</logger>
</springProfile>
<!--测试环境:打印控制台-->
<springProfile name="prod">
<springProfile name="dev">
<root level="INFO">
<appender-ref ref="asyncFileAppender"/>
<appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="CONSOLE"/>
</root>
<logger name="org.springframework" level="ERROR" additivity="false">
<logger name="jdbc" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.apache" level="ERROR" additivity="false">
<logger name="org.springframework" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.hibernate" level="ERROR" additivity="false">
<logger name="org.hibernate" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="io.netty" level="ERROR" additivity="false">
<logger name="org.quartz" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="jdbc" level="ERROR" additivity="false">
<logger name="com.google" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="io.lettuce" level="ERROR" additivity="false">
<logger name="org.redisson" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="com.fasterxml" level="ERROR" additivity="false">
<logger name="org.nl.modules.wql" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.quartz" level="ERROR" additivity="false">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="com.google" level="ERROR" additivity="false">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="springfox" level="ERROR" additivity="false">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="log4jdbc" level="ERROR" additivity="false">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="nl.basjes" level="ERROR" additivity="false">
<logger name="org.springframework.data" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
</springProfile>

2
lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue
View File

@@ -14,7 +14,7 @@
</template>
<script>
import Logo from '@/assets/images/zgwk3.png'
import Logo from '@/assets/images/zgwk2.png'
import variables from '@/assets/styles/variables.scss'
export default {
name: 'SidebarLogo',

8
lms/nladmin-ui/src/views/wms/pm_manage/workerorder/MaterialDialog.vue
View File

@@ -80,7 +80,7 @@
<el-table-column v-if="!isSingle" type="selection" width="55" :selectable="checkSelectable"/>
<el-table-column v-if="isSingle" label="选择" width="55">
<template slot-scope="scope">
<el-radio v-model="tableRadio" :label="scope.row" :disabled="scope.row.struct_code !== 'YL'"><i /></el-radio>
<el-radio v-model="tableRadio" :label="scope.row" :disabled="scope.row.stor_code !== 'YL'"><i /></el-radio>
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" width="160" />
@@ -164,7 +164,9 @@ export default {
},
methods: {
clickChange(item) {
this.tableRadio = item
if (item.stor_code === 'YL') {
this.tableRadio = item
}
},
open() {
crudBsrealstorattr.getStor().then(res => {
@@ -204,7 +206,7 @@ export default {
this.$emit('tableChanged', this.rows, this.flag)
},
checkSelectable(row, index) {
return row.struct_code !== 'YL'
return row.stor_code === 'YL'
}
}
}

6
lms/nladmin-ui/src/views/wms/pm_manage/workerorder/MaterialDialog2.vue
View File

@@ -79,17 +79,17 @@
<el-table-column v-if="!isSingle" type="selection" width="55" :selectable="checkSelectable"/>
<el-table-column v-if="isSingle" label="选择" width="55">
<template slot-scope="scope">
<el-radio v-model="tableRadio" :label="scope.row" :disabled="scope.row.struct_code === 'YL'"><i /></el-radio>
<el-radio v-model="tableRadio" :label="scope.row" :disabled="scope.row.stor_code === 'YL'"><i /></el-radio>
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" width="160" />
<el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
<el-table-column prop="pcsn" label="物料批次" width="180" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="140" />
<el-table-column prop="struct_code" label="仓位编码" width="160" />
<el-table-column prop="storagevehicle_code" label="载具编码" width="160" />
<el-table-column prop="qty_unit_name" label="单位" width="160" />
<el-table-column prop="supp_name" label="供应商" width="160" />
<el-table-column prop="material_spec" label="物料规格" width="140" />
<!-- <el-table-column prop="material_model" label="物料型号" width="140" />-->
<el-table-column prop="update_name" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="135" />
@@ -193,7 +193,7 @@ export default {
this.$emit('tableChanged', this.rows)
},
checkSelectable(row, index) {
return row.struct_code === 'YL'
return row.stor_code === 'YL'
}
}
}