diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java index 4ffd899..03d9e29 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java @@ -392,7 +392,7 @@ public class DmYdjh implements Serializable { //7预留其他工序 //坡口,曲面,打磨 - PK("81"), QM("82"),DM("83"), + PK("81"),PKFK("82"), QM("83"),QMFK("84"),DM("85"),DMFK("86"), WC("99")//完成 ; @Getter diff --git a/src/main/resources/mappers/zyjh/YcldwMapper.xml b/src/main/resources/mappers/zyjh/YcldwMapper.xml index 6996532..77cee38 100644 --- a/src/main/resources/mappers/zyjh/YcldwMapper.xml +++ b/src/main/resources/mappers/zyjh/YcldwMapper.xml @@ -42,6 +42,6 @@ a.type = #{type} - order by a.tzbh,ceng + order by a.id,ceng