diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml index 6c85d560..51c544ae 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml @@ -72,9 +72,10 @@ b.id, b.id AS productId, b.NAME AS NAME, - b.spec, + a.spec, b.bar_code AS barCode, a.is_input AS isInput, + a.code, CASE b.inventory_type WHEN 1 THEN diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue index 006dd07d..fe8f20a3 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue @@ -342,20 +342,23 @@ align="center" prop="cargoId" width="180px"> + *货区名称 + + + + - +