diff --git a/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java b/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java index 5728e3a..d32d2ac 100644 --- a/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java +++ b/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java @@ -138,6 +138,9 @@ public class PoundBillServiceImpl extends ServiceImplusrcode, name, type, + poundclass, pos, poundtype, defweighttype, @@ -73,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{usrcode}, #{name}, #{type}, + #{poundclass}, #{pos}, #{poundtype}, #{defweighttype}, @@ -92,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" usrcode = #{usrcode}, name = #{name}, type = #{type}, + poundclass = #{poundclass}, pos = #{pos}, poundtype = #{poundtype}, defweighttype = #{defweighttype}, diff --git a/measurement/src/main/resources/mapper/measurement/basedata/EmpwgtdataMapper.xml b/measurement/src/main/resources/mapper/measurement/basedata/EmpwgtdataMapper.xml index b080bdc..f4ea195 100644 --- a/measurement/src/main/resources/mapper/measurement/basedata/EmpwgtdataMapper.xml +++ b/measurement/src/main/resources/mapper/measurement/basedata/EmpwgtdataMapper.xml @@ -69,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" poundname, crtorgid, isinuse, + isused, crtdt, crtopr, lstedtdt, @@ -87,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{poundname}, #{crtorgid}, #{isinuse}, + #{isused}, #{crtdt}, #{crtopr}, #{lstedtdt}, @@ -108,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" poundname = #{poundname}, crtorgid = #{crtorgid}, isinuse = #{isinuse}, + isused = #{isused}, crtdt = #{crtdt}, crtopr = #{crtopr}, lstedtdt = #{lstedtdt}, diff --git a/measurement/src/main/resources/mapper/measurement/basedata/TruepoundMapper.xml b/measurement/src/main/resources/mapper/measurement/basedata/TruepoundMapper.xml index c8ddf42..7266201 100644 --- a/measurement/src/main/resources/mapper/measurement/basedata/TruepoundMapper.xml +++ b/measurement/src/main/resources/mapper/measurement/basedata/TruepoundMapper.xml @@ -76,6 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" usrcode, name, type, + poundtype, + poundclass, mac, comport, commset, @@ -89,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" getdatapos, getdatalen, crtorgid, + oabilltype, remark, isinuse, crtdt, @@ -101,6 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{usrcode}, #{name}, #{type}, + #{poundtype}, + #{poundclass}, #{mac}, #{comport}, #{commset}, @@ -114,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{getdatapos}, #{getdatalen}, #{crtorgid}, + #{oabilltype}, #{remark}, #{isinuse}, #{crtdt}, @@ -129,6 +135,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" usrcode = #{usrcode}, name = #{name}, type = #{type}, + type = #{poundtype}, + type = #{poundclass}, mac = #{mac}, comport = #{comport}, commset = #{commset}, @@ -142,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" getdatapos = #{getdatapos}, getdatalen = #{getdatalen}, crtorgid = #{crtorgid}, + oabilltype = #{oabilltype}, remark = #{remark}, isinuse = #{isinuse}, crtdt = #{crtdt}, diff --git a/measurement/src/main/resources/mapper/measurement/bill/PoundBillMapper.xml b/measurement/src/main/resources/mapper/measurement/bill/PoundBillMapper.xml index 356fe11..87524c3 100644 --- a/measurement/src/main/resources/mapper/measurement/bill/PoundBillMapper.xml +++ b/measurement/src/main/resources/mapper/measurement/bill/PoundBillMapper.xml @@ -215,6 +215,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" srcbllusrcode, remark, boilerno, + + agnstatus, + agngrossmqty, + agntaremqty, + agnnetmqty, + ductmqty, + ductmqtypre, + steeno, unitlen, indexid, @@ -283,6 +291,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{srcbllusrcode}, #{remark}, #{boilerno}, + + #{agnstatus}, + #{agngrossmqty}, + #{agntaremqty}, + #{agnnetmqty}, + #{ductmqty}, + #{ductmqtypre}, + #{steeno}, #{unitlen}, #{indexid}, @@ -354,6 +370,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" srcbllusrcode = #{srcbllusrcode}, remark = #{remark}, boilerno = #{boilerno}, + + agnstatus = #{agnstatus}, + agngrossmqty = #{agngrossmqty}, + agntaremqty = #{agntaremqty}, + agnnetmqty = #{agnnetmqty}, + ductmqty = #{ductmqty}, + ductmqtypre = #{ductmqtypre}, + steeno = #{steeno}, unitlen = #{unitlen}, indexid = #{indexid}, diff --git a/measurement/src/main/resources/mapper/measurement/bill/PoundappliMapper.xml b/measurement/src/main/resources/mapper/measurement/bill/PoundappliMapper.xml index fc53b6a..5f206fc 100644 --- a/measurement/src/main/resources/mapper/measurement/bill/PoundappliMapper.xml +++ b/measurement/src/main/resources/mapper/measurement/bill/PoundappliMapper.xml @@ -21,7 +21,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -126,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" cardriver, poundid, poundname, + srcbilltype, srcbillusrcode, crtorgid, isinuse, @@ -134,10 +134,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lstedtdt, lstedtopr, fid, - zgsId, - zgsName, fentity_fentryid, oabilltype, + zgsId, + zgsName, remark, SELECT @@ -164,6 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{cardriver}, #{poundid}, #{poundname}, + #{srcbilltype}, #{srcbillusrcode}, #{crtorgid}, #{isinuse}, @@ -172,10 +173,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{lstedtdt}, #{lstedtopr}, #{fid}, - #{zgsId}, - #{zgsName}, #{fentity_fentryid}, #{oabilltype}, + #{zgsId}, + #{zgsName}, #{remark}, FROM DUAL @@ -210,6 +211,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" cardriver = #{cardriver}, poundid = #{poundid}, poundname = #{poundname}, + srcbilltype = #{srcbilltype}, srcbillusrcode = #{srcbillusrcode}, crtorgid = #{crtorgid}, isinuse = #{isinuse}, @@ -218,10 +220,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lstedtdt = #{lstedtdt}, lstedtopr = #{lstedtopr}, fid = #{fid}, - zgsId = #{zgsId}, - zgsName = #{zgsName}, fentity_fentryid = #{fentity_fentryid}, oabilltype = #{oabilltype}, + zgsId = #{zgsId}, + zgsName = #{zgsName}, remark = #{remark}, where id = #{id} diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue index 5c31196..00e7430 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/ruoyi-ui/src/layout/components/Navbar.vue @@ -9,13 +9,13 @@