From 9454b289e4e97b82ea6ce5d48b04c2342e028c92 Mon Sep 17 00:00:00 2001
From: fs-danaus <danaus314@qq.com>
Date: 星期二, 10 八月 2021 17:33:34 +0800
Subject: [PATCH] 完善序列号扫码功能
---
src/com/yc/api/service/ApiService.java | 2 +-
src/com/yc/service/build/type/v2/BaseImpl.java | 2 +-
src/com/yc/service/grid/GridServiceImpl.java | 2 +-
src/com/yc/app/v2/service/impl/BaseFormServiceImpl.java | 12 +++++++++++-
src/com/yc/app/v2/entity/GformEntity.java | 32 ++++++++++++++++++++++++++++++++
5 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/src/com/yc/api/service/ApiService.java b/src/com/yc/api/service/ApiService.java
index 1b9d28e..5fcd9b7 100644
--- a/src/com/yc/api/service/ApiService.java
+++ b/src/com/yc/api/service/ApiService.java
@@ -70,7 +70,7 @@
" select @tableName as tableNmae";
String tableName =this.jdbcTemplate.queryForObject(sql,String.class,entity.getFormid(),entity.getFormType());
sql="set nocount on \n" +
- " select matCode,matName,rowid,special,uom ,digit,serialNumbers from "+tableName+" where docCode=?";
+ " select a.matCode,a.matName,a.rowid,a.special,a.uom ,a.digit,a.serialNumbers from "+tableName+" a join t110503 b on a.MatCode=b.MatCode where a.docCode=? and isnull(b.isStartupSerialNumber,0)=1";
return this.jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(T110503Entity.class),entity.getDocCode());
}
diff --git a/src/com/yc/app/v2/entity/GformEntity.java b/src/com/yc/app/v2/entity/GformEntity.java
index b2433b6..cc82ced 100644
--- a/src/com/yc/app/v2/entity/GformEntity.java
+++ b/src/com/yc/app/v2/entity/GformEntity.java
@@ -666,6 +666,38 @@
*/
@ApiModelProperty(value = "")
private Integer controltopics;
+
+ /**
+ *
+ */
+ @ApiModelProperty(value = "")
+ private Integer isshowinserialbtn;
+ /**
+ *
+ */
+ @ApiModelProperty(value = "")
+ private String inserialbtneditstatus;
+ /**
+ *
+ */
+ @ApiModelProperty(value = "")
+ private Integer isshowoutserialbtn;
+ /**
+ *
+ */
+ @ApiModelProperty(value = "")
+ private String outserialbtneditstatus;
+ /**
+ *
+ */
+ @ApiModelProperty(value = "")
+ private Integer isshowonlinepaymentbutton;
+ /**
+ *
+ */
+ @ApiModelProperty(value = "")
+ private String onlinepaymentbtneditstatus;
+
//榛樿鍙栦富琛ㄨ〃鍚�
boolean isGetHeadTabe=true;
private static final long serialVersionUID = 1L;
diff --git a/src/com/yc/app/v2/service/impl/BaseFormServiceImpl.java b/src/com/yc/app/v2/service/impl/BaseFormServiceImpl.java
index 6b4dbaf..c0c727e 100644
--- a/src/com/yc/app/v2/service/impl/BaseFormServiceImpl.java
+++ b/src/com/yc/app/v2/service/impl/BaseFormServiceImpl.java
@@ -223,7 +223,17 @@
*
* */
if (formVOEntity.getVersion() != null) {
- final Integer version = this.getSimpleJdbcTemplate().queryForObject(" select count(1) from gform where formid=? and isnull(version,0)>?", Integer.class, formVOEntity.getFormId(), formVOEntity.getVersion());
+ final Integer version = this.getSimpleJdbcTemplate().queryForObject(" set nocount on ; declare @FormId int = ?,@OldVersion int = ?,@Version int,@isFound int = 0\n" +
+ "if @OldVersion is null\n" +
+ "begin\n" +
+ " set @isFound = 1 \n" +
+ "end \n" +
+ "if isnull(@isFound,0) = 0\n" +
+ "begin \n" +
+ " select @Version = Version from gform where formid=@FormId\n" +
+ " if isnull(@version,0) <> isnull(@OldVersion,0) set @isFound = 1 else set @isFound = 0 \n" +
+ "end\n" +
+ "select @isFound ", Integer.class, formVOEntity.getFormId(), formVOEntity.getVersion());
//鐗堟湰鍙风浉鍚岃〃绀轰笉闇�瑕佺敓鎴愬厓鏁版嵁
if (version == 0) {
//return null;
diff --git a/src/com/yc/service/build/type/v2/BaseImpl.java b/src/com/yc/service/build/type/v2/BaseImpl.java
index f83880e..b7ac4c8 100644
--- a/src/com/yc/service/build/type/v2/BaseImpl.java
+++ b/src/com/yc/service/build/type/v2/BaseImpl.java
@@ -41,7 +41,7 @@
protected PanelServiceIfc pIfc;
public static String BEAN_INFO = "beaninfo";
- private static String GFORM_SQL = " isTitle,formname,showdetail,isopenFuncshowpwdedit,isshowpwdedit,optype,HDTable,version,dataformid,formdatafilters,panellabellayout,CancelBtnProcName,CancelBtnExpression,CancelBtnEditStatus,CancelBtnName,RevokeBtnProcName,RevokeBtnExpression,RevokeBtnEditStatus,isShowOnlineMsg,isShowProcessTracking,autoOpen,predocstatus,procgroupaftersavedoc,dealafterdocsave,transgroupcode,dttable,isShowNewDocButton,isStartupSerialNumber,SerialNumberBtnEditStatus ";
+ private static String GFORM_SQL = " isTitle,formname,showdetail,isopenFuncshowpwdedit,isshowpwdedit,optype,HDTable,version,dataformid,formdatafilters,panellabellayout,CancelBtnProcName,CancelBtnExpression,CancelBtnEditStatus,CancelBtnName,RevokeBtnProcName,RevokeBtnExpression,RevokeBtnEditStatus,isShowOnlineMsg,isShowProcessTracking,autoOpen,predocstatus,procgroupaftersavedoc,dealafterdocsave,transgroupcode,dttable,isShowNewDocButton,isshowinserialbtn,inserialbtneditstatus,isshowoutserialbtn ,outserialbtneditstatus,isshowonlinepaymentbutton,onlinepaymentbtneditstatus ";
protected Map<String, Object> getGformInfo(String formid) {
return gformIfc.getGformInfo(GFORM_SQL, Integer.parseInt(formid));
diff --git a/src/com/yc/service/grid/GridServiceImpl.java b/src/com/yc/service/grid/GridServiceImpl.java
index 419ec59..e51a7b9 100644
--- a/src/com/yc/service/grid/GridServiceImpl.java
+++ b/src/com/yc/service/grid/GridServiceImpl.java
@@ -50,7 +50,7 @@
public class GridServiceImpl extends BaseService implements GridServiceIfc {
@Autowired
Type38Ifc type38Ifc;
- private final String gform = "[formid], [formname],[isused],[formmemo],[optype],[refformid],[hdtable],[dttable],[showdetail],[fetchrecnumber],[queryform],[refreshTime],[refresh_aftersave],[frozencols],[LockGridSort],[rowcopyfields],[rowcopyformids],[rowDelFormids],[index1],[index1primary],[index2],[index2primary],[index3],[index3Primary],[dataformid],[predocstatus],[postdocstatus],[DocStatusName],[transgroupcode],[codelength],[preFixcode],[precodetype],[helpdoc_udl],[checkblncfields],[formalign],[DealAfterDocSave],[AllowEmptyRow],[Busi2fiDataView],[glcodefield],[txtinputfields],[DBCtrlRowCount],[ShowAsDetailMode],[modifytableflag],[applytableflag],[CrossInputType],[MultiTitleType],[datapooled],[glentitycode],[formdatafilters],[ProcGroupafterSavedoc], [TransTypecode],[currencyfld],[chkFormula],[GridFormatFun],[SelectChecker],[ReturnCurChecker],[ReturnCurCheckerName],[FT],[FTFormType],[FK],[SeekGroupID],[sPremissField],[dPremissField],[FKeFilter],[GridRowHeight],[GridHeight], [isShowPwdEdit], [isOpenFuncShowPwdEdit], [isShowOnlineMsg] ,[isShowProcessTracking] ,[PanelLabelLayout],[isTitle], [isTaobao],[cellAlign] ,[pageSize],[version],[reportprompts],[CancelBtnProcName],[CancelBtnExpression],[CancelBtnEditStatus],[isShowCell],[importProcName],[CancelIsSave],[CancelBtnName],[isGantt],[byGroup],[DefaultRowCount],[Expanded], [isFilter], [JNIName],[JNIDataBaseURL], [JNIPort] ,[JNIDataBaseName], [JNIUser], [JNIPwd] ,[JNISql] ,[JNITempTable],[addNewRow],[autopaging],[RevokeBtnProcName],[RevokeBtnExpression],[RevokeBtnEditStatus],[autoOpen],isExchangeDataWithHost,isShowNewDocButton,isShowMemoWhenApprovals,isStartupSerialNumber,SerialNumberBtnEditStatus,isShowOnlinePaymentButton,onlinePaymentBtnEditStatus ";
+ private final String gform = "[formid], [formname],[isused],[formmemo],[optype],[refformid],[hdtable],[dttable],[showdetail],[fetchrecnumber],[queryform],[refreshTime],[refresh_aftersave],[frozencols],[LockGridSort],[rowcopyfields],[rowcopyformids],[rowDelFormids],[index1],[index1primary],[index2],[index2primary],[index3],[index3Primary],[dataformid],[predocstatus],[postdocstatus],[DocStatusName],[transgroupcode],[codelength],[preFixcode],[precodetype],[helpdoc_udl],[checkblncfields],[formalign],[DealAfterDocSave],[AllowEmptyRow],[Busi2fiDataView],[glcodefield],[txtinputfields],[DBCtrlRowCount],[ShowAsDetailMode],[modifytableflag],[applytableflag],[CrossInputType],[MultiTitleType],[datapooled],[glentitycode],[formdatafilters],[ProcGroupafterSavedoc], [TransTypecode],[currencyfld],[chkFormula],[GridFormatFun],[SelectChecker],[ReturnCurChecker],[ReturnCurCheckerName],[FT],[FTFormType],[FK],[SeekGroupID],[sPremissField],[dPremissField],[FKeFilter],[GridRowHeight],[GridHeight], [isShowPwdEdit], [isOpenFuncShowPwdEdit], [isShowOnlineMsg] ,[isShowProcessTracking] ,[PanelLabelLayout],[isTitle], [isTaobao],[cellAlign] ,[pageSize],[version],[reportprompts],[CancelBtnProcName],[CancelBtnExpression],[CancelBtnEditStatus],[isShowCell],[importProcName],[CancelIsSave],[CancelBtnName],[isGantt],[byGroup],[DefaultRowCount],[Expanded], [isFilter], [JNIName],[JNIDataBaseURL], [JNIPort] ,[JNIDataBaseName], [JNIUser], [JNIPwd] ,[JNISql] ,[JNITempTable],[addNewRow],[autopaging],[RevokeBtnProcName],[RevokeBtnExpression],[RevokeBtnEditStatus],[autoOpen],isExchangeDataWithHost,isShowNewDocButton,isShowMemoWhenApprovals,isshowinserialbtn,inserialbtneditstatus,isshowoutserialbtn ,outserialbtneditstatus,isShowOnlinePaymentButton,onlinePaymentBtnEditStatus ";
private final String gfield = "[formid],[headflag], [fieldid],[statisid],[Lblcode],[fieldname],[datatype],[displayformat], [showongrid],[gridcaption], [gridcontroltype],[gridlength],[ft],[ftformtype],[emptyrefdata], [fk],[seekgroupid],[spremissfield],[dpremissfield],[efilter],[return_one_record],[numfieldid], [visible], [hidelabel], [controltype],[rowno],[colno],[lengthnum],[heightnum],[detailrowno],[detailcolno],[detaillength],[detailheight],[statisflag] ,[blcheckauth],[indexfld],[readonly],[datalink],[keyinput],[secretfld],[calcufield],[formula],[sumfield],[funclinkname],[activefuns] ,[initvalue] ,[checkauthmode],[PreLike],[EnterToNextRow],[tabsheetname],[passwordchar],[uppercase] ,[LinkFormDisplayFields], [dyfieldview],[copyfromlastrow],[ftlockconditionflag],[datafilterfield], [HelpKeyID] ,[MultiLangYN], [IMEactive] , [memo], [Hints],[editStatus],[isReader] ,[SqlScript],[MasterFieldShowLocation], [isCustomHTMLComponent] , [showFieldValueExpression],[HyperlinkFT],[HyperlinkFTFormType],[HyperlinkSPremissField], [HyperlinkDPremissField],[HyperlinkEFilter],[Hyperlinkmode],[isAutoSaved],[stylecss],[rowSpan] ,[isImport],[isExport],[fieldtype],[cellAlign], [isCopyExclude],[isAutoRefresh],[isLoad],[Audit],[TipsExpression],[SuggestFileds],[RelationField],[onlyOne],AppColNo,AppHeight,AppHideLabel,AppLength,AppRowNo,AppVisible,ScanCodeField,funclinkname,exportTitle,isAPPExcludeField,SqlWhere,afterBlockDividingLine ";
--
Gitblit v1.8.0