diff --git a/measurement/src/main/java/com/ruoyi/bill/service/IPoundappliService.java b/measurement/src/main/java/com/ruoyi/bill/service/IPoundappliService.java index 80963ba..c32749c 100644 --- a/measurement/src/main/java/com/ruoyi/bill/service/IPoundappliService.java +++ b/measurement/src/main/java/com/ruoyi/bill/service/IPoundappliService.java @@ -29,6 +29,14 @@ public interface IPoundappliService extends IService */ public List selectPoundappliList(Poundappli poundappli); + /** + * 新增过磅申请(通过mapper层调用) + * + * @param poundappli 过磅申请 + * @return 结果 + */ + public int insertPoundappliDpi(Poundappli poundappli); + /** * 新增过磅申请 * diff --git a/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundappliServiceImpl.java b/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundappliServiceImpl.java index 4992645..9ea1ae4 100644 --- a/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundappliServiceImpl.java +++ b/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundappliServiceImpl.java @@ -46,12 +46,26 @@ public class PoundappliServiceImpl extends ServiceImpl - INSERT INTO t_data_poundappli - - id, - bllstate, - usrcode, - bsndt, - carno, - itmname, - specification, - sendunitid, - sendunitname, - recentname, - trnentname, - srcpunbll, - srcwghmqty, - srcempmqty, - srccleanmqty, - srcbsndt, - msrunit, - msrname, - itmno, - cardriver, - poundid, - poundname, - srcbillusrcode, - crtorgid, - isinuse, - crtdt, - crtopr, - lstedtdt, - lstedtopr, - fid, - fentity_fentryid, - oabilltype, - remark, - - - #{id},NULL, - #{bllstate},NULL, - #{usrcode},NULL, - #{bsndt},NULL, - #{carno},NULL, - #{itmname},NULL, - #{specification},NULL, - #{sendunitid},NULL, - #{sendunitname},NULL, - #{recentname},NULL, - #{trnentname},NULL, - #{srcpunbll},NULL, - #{srcwghmqty},NULL, - #{srcempmqty},NULL, - #{srccleanmqty},NULL, - #{srcbsndt},NULL, - #{msrunit},NULL, - #{msrname},NULL, - #{itmno},NULL, - #{cardriver},NULL, - #{poundid},NULL, - #{poundname},NULL, - #{srcbillusrcode},NULL, - #{crtorgid},NULL, - #{isinuse},NULL, - #{crtdt},NULL, - #{crtopr},NULL, - #{lstedtdt},NULL, - #{lstedtopr},NULL, - #{fid},NULL, - #{fentity_fentryid},NULL, - #{oabilltype},NULL, - #{remark},NULL, - - + insert IGNORE into t_data_poundappli + + id, + bllstate, + usrcode, + bsndt, + carno, + itmname, + specification, + sendunitid, + sendunitname, + recentname, + trnentname, + srcpunbll, + srcwghmqty, + srcempmqty, + srccleanmqty, + srcbsndt, + msrunit, + msrname, + itmno, + cardriver, + poundid, + poundname, + srcbillusrcode, + crtorgid, + isinuse, + crtdt, + crtopr, + lstedtdt, + lstedtopr, + fid, + fentity_fentryid, + oabilltype, + remark, + + + #{id}, + #{bllstate}, + #{usrcode}, + #{bsndt}, + #{carno}, + #{itmname}, + #{specification}, + #{sendunitid}, + #{sendunitname}, + #{recentname}, + #{trnentname}, + #{srcpunbll}, + #{srcwghmqty}, + #{srcempmqty}, + #{srccleanmqty}, + #{srcbsndt}, + #{msrunit}, + #{msrname}, + #{itmno}, + #{cardriver}, + #{poundid}, + #{poundname}, + #{srcbillusrcode}, + #{crtorgid}, + #{isinuse}, + #{crtdt}, + #{crtopr}, + #{lstedtdt}, + #{lstedtopr}, + #{fid}, + #{fentity_fentryid}, + #{oabilltype}, + #{remark}, + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index 48bc43c..f9a2383 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -193,7 +193,14 @@ public class BaseEntity implements Serializable * 初始化新增实体的通用字段 */ public void initAddFields(BaseEntity entity) { - String currentUser = SecurityUtils.getUsername(); // 获取当前登录用户 + String currentUser = "admin"; + // 获取当前登录用户 + try { + currentUser = SecurityUtils.getUsername(); + } catch (Exception e) { + //Do nothing + } + Date now = new Date(); entity.setIsinuse("Y"); // 默认启用状态 @@ -207,7 +214,13 @@ public class BaseEntity implements Serializable * 更新实体的修改字段 */ public void initUpdateFields(BaseEntity entity) { - String currentUser = SecurityUtils.getUsername(); // 获取当前登录用户 + String currentUser = "admin"; + // 获取当前登录用户 + try { + currentUser = SecurityUtils.getUsername(); + } catch (Exception e) { + //Do nothing + } Date now = new Date(); entity.setLstedtdt(now); // 更新最后修改时间