diff --git a/DSWeb/Areas/MvcShipping/DAL/WMSOUT_GuiGe/WMSOUT_GuiGeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/WMSOUT_GuiGe/WMSOUT_GuiGeDAL.cs index 40161ba6..945a8da7 100644 --- a/DSWeb/Areas/MvcShipping/DAL/WMSOUT_GuiGe/WMSOUT_GuiGeDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/WMSOUT_GuiGe/WMSOUT_GuiGeDAL.cs @@ -49,7 +49,8 @@ namespace DSWeb.MvcShipping.DAL.WMSOUT_GuiGeDAL string strCwSTARTGID = BasicDataRefDAL.GetCwSTARTGID(userid); var strSql = new StringBuilder(); - strSql.Append(" *, MODIFIEDUSERNAME=(select top 1 [SHOWNAME] from [user] where gid=wms_out.MODIFIEDUSER),FEESTATUSREF=(case when FEESTATUS='True' then '锁定' else '未锁定' end)" + strSql.Append(" [GID],[ASSOCIATEDNO],[BSNO],[CLIENTGID],[CLIENTCODE],[CUSTOMERNAME],[DODATE],[STORAGECODE],[STORAGENAME],[AREACODE],[AREANAME],[GOODSCODE],[GOODSNAME],[GOODSTYPE],[GOODSMODEL],[GOODSSTANDARD],[GOODSPACK],[GOODSPFSL],[GOODSOUTFEE],[TRUCKNO],[REMARK],[ISDELETE],[DELETETIME],[DELETEUSER],[CREATEUSER],[CREATETIME],[MODIFIEDUSER],[MODIFIEDTIME],[GOODSPACKPFSL],[TRUCKNAME],[WMSOP],[STOREMAN],[ISLOCK],[LOCKUSER],[LOCKTIME],[GOODSOUTFEEAP],[ARFEE],[APFEE],[INSPECTIONNO],[CUSTOMNO],[CORPID],[CLIENTNAMEOLD],[OLDCUSTFEEDATE],[CLIENTBSNO],[ARCLIENT],[INGIDNEW],[TOTALNO],[REMARK2],[VALIDDATE],[CHARGEUNIT],[MBLNONEW],[ISCHANGE],[MARKETVALUE],[ARCLIENTWMSOUT],[ISCOLLECTING],[WMSOUTSTATUS],[BZTCHNO],[WHS_CODE],[GOODSNAMEID],[ACCDATE],[FEESTATUS],[ARFEE_2],[ISVOU],[VOUNO],[FilePath],[EXPRESSEXNO],[EXPRESSCORP],[IsDetail],[SaleContract],[EIP],[zhuangxiefei],[QUOTANO],[RENTAREA],[CNTRTOTAL],[KGS_OUT],[PKGS_OUT],[CBM_OUT],[BillFeeStatus],[BILLFEESTATUSTIME],[COUNTRYOFORIGIN]" + + ", MODIFIEDUSERNAME=(select top 1 [SHOWNAME] from [user] where gid=wms_out.MODIFIEDUSER),FEESTATUSREF=(case when FEESTATUS='True' then '锁定' else '未锁定' end)" + ", dbo.F_GetBillDrFeeStatus_WMS(GID) DRFEESTATUS"//需求编号:SR2017071300002-1 + ", dbo.F_GetBillCrFeeStatus_WMS(GID) CRFEESTATUS"//需求编号:SR2017071300002-1 //+ ", MBLNO=isnull((select top 1 MBLNO from op_seai where bsno=wms_out.ASSOCIATEDNO),(select top 1 BLNO from wms where ASSOCIATEDNO=wms_out.ASSOCIATEDNO))"//需求编号:SR2017071300002-2