LG88888888 3 lat temu
rodzic
commit
3097b05b16

+ 9 - 9
src/main/java/net/chenlin/dp/modules/api/mapper/SaleOrderMapper.xml

@@ -74,7 +74,7 @@
 
 	<insert id="UInsertSaleOrderBJ">
 		INSERT INTO SA_QuoMain (
-			cSTCode,iVTid,ID,dDate,cCode,cCusCode,cDepCode,cPersonCode,cexch_name,iExchRate,iTaxRate,cMemo,cMaker,cVerifier,cCloser,cBusType,dcreatesystime
+									cSTCode,iVTid,ID,dDate,cCode,cCusCode,cDepCode,cPersonCode,cexch_name,iExchRate,iTaxRate,cMemo,cMaker,cVerifier,cCloser,cBusType,dcreatesystime
 
 		)
 		VALUES (
@@ -87,7 +87,7 @@
 				   #{cDepCode},
 				   #{cPersonCode},
 				   '人民币',
-				   #{iExchRate},
+				   '1',
 				   #{iTaxRate},
 				   #{cMemo},
 				   #{cMaker},
@@ -303,7 +303,7 @@
 			#{saleOrderFTHMins.inatmoney},
 			#{saleOrderFTHMins.inattax},
 			#{saleOrderFTHMins.inatsum},
-			#{saleOrderFTHMins.isosid},
+			'0',
 			#{saleOrderFTHMins.cinvname},
 			#{saleOrderFTHMins.itaxrate},
 			#{saleOrderFTHMins.citemcode},
@@ -353,8 +353,8 @@
 	</select>
 
 	<select id="selectCode" resultType="net.chenlin.dp.modules.api.vo.SaleOrderBJMin">
-		select a.ID,a.AutoID,a.irowno,a.cInvCode,a.iQuantity,a.cUnitID,a.iInvExchRate,a.iNum,a.iQuotedPrice,a.iUnitPrice,a.iTaxUnitPrice,a.iNatMoney,a.iNatTax,a.iNatSum,
-			   a.iNatDisCount,a.cMemo,(a.iTaxRate*100) as 'iTaxRate',a.KL,b.cItemCode,b.cItem_class,b.cItemName,b.cItem_CName,a.cCusInvCode,a.cCusInvName,a.iMoney,a.iTax,a.iSum,a.iDisCount,a.iNatUnitPrice from  CRM_U8_SA_QuoDetails a left join CRM_U8_SA_QuoMain b on a.id=b.id
+		select a.ID,a.AutoID,a.irowno,a.cInvCode,isnull(a.iQuantity,0) as 'iQuantity',a.cUnitID,isnull(a.iInvExchRate,0)as 'iInvExchRate',isnull(a.iNum,0)as 'iNum',isnull(a.iQuotedPrice,0)as 'iQuotedPrice',isnull(a.iUnitPrice,0)as 'iUnitPrice',isnull(a.iTaxUnitPrice,0)as 'iTaxUnitPrice',isnull(a.iNatMoney,0)as 'iNatMoney',isnull(a.iNatTax,0)as 'iNatTax',isnull(a.iNatSum,0) as 'iNatSum',
+			  isnull(a.iNatDisCount,0)as 'iNatDisCount' ,a.cMemo,(a.iTaxRate*100) as 'iTaxRate',isnull(a.KL,0)as 'KL',b.cItemCode,b.cItem_class,b.cItemName,b.cItem_CName,a.cCusInvCode,a.cCusInvName,isnull(a.iMoney,0)as 'iMoney',isnull(a.iTax,0)as 'iTax',isnull(a.iSum,0)as 'iSum',isnull(a.iDisCount,0)as 'iDisCount',isnull(a.iNatUnitPrice,0)as 'iNatUnitPrice' from  CRM_U8_SA_QuoDetails a left join CRM_U8_SA_QuoMain b on a.id=b.id
 				where a.id=#{id}
 	</select>
 	<select id="CrmSaleOrderList" resultType="net.chenlin.dp.modules.api.vo.YonyouSaleOrder">
@@ -414,10 +414,10 @@
 	<select id="CrmKSOrderTHList" resultType="net.chenlin.dp.modules.api.vo.SaleOrderFTH">
 		select cVouchID,id as 'dlid',
 				   cdlcode,cvouchtype,cstcode,ddate,crdcode,cdepcode,cpersoncode,ccuscode,csccode,cshipaddress,cexch_name as 'cexchname',iexchrate,
-			   itaxrate,breturnflag, cmaker,ccusname,cbustype from crm_u8_DispatchList
+			   itaxrate,breturnflag, cmaker,ccusname,cbustype from crm_u8_DispatchList where issyu8 =0 or issyu8 is null
 	</select>
 	<select id="CrmKSOrderTHMinList" resultType="net.chenlin.dp.modules.api.vo.SaleOrderFTHMin">
-		select  a.autoid,a.dlid,a.icorid,a.cwhcode,a.cinvcode,a.iquantity,a.inum,a.iunitprice,a.itaxunitprice,a.imoney,a.itax,a.isum, a.inatunitprice,a.inatmoney,a.inattax,a.inatsum,a.isosid,a.cinvname,a.itaxrate,b.citemcode,b.citem_class citemclass,a.iinvexchrate,a.cunitid,a.csocode,a.ccusinvcode,a.ccusinvname
+		select  a.autoid,a.dlid,a.icorid,a.cwhcode,a.cinvcode,isnull((a.iquantity*-1 ),'0')as 'iquantity',isnull((a.inum*-1),'0') as 'inum',isnull(a.iunitprice,'0') as 'iunitprice' ,isnull(a.itaxunitprice,'0') as 'itaxunitprice',isnull((a.imoney*-1),'0') as 'imoney',isnull((a.itax*-1),'0') as 'itax',isnull((a.isum*-1),'0')as 'isum', isnull(a.inatunitprice,'0') as 'inatunitprice',isnull((a.inatmoney*-1),'0' )as 'inatmoney',isnull((a.inattax*-1 ),'0')as 'inattax',isnull((a.inatsum*-1),'0') as 'inatsum',a.isosid,a.cinvname,a.itaxrate,b.citemcode,b.citem_class citemclass,a.iinvexchrate,a.cunitid,a.csocode,a.ccusinvcode,a.ccusinvname
 		from  CRM_U8_DispatchItem a
 				  left join CRM_U8_DispatchList b on a.mid=b.id
  where a.Mid=#{id}
@@ -429,8 +429,8 @@
 			   (itaxrate*100) as 'itaxrate' ,breturnflag, cmaker,ccusname,cbustype from CRM_U8_Deduction where issyu8 =0 or issyu8 is null
 	</select>
 	<select id="CrmKSDOrderFHMin" resultType="net.chenlin.dp.modules.api.vo.SaleOrderFTHMin">
-		select  a.autoid,a.dlid,a.cinvcode,a.iquantity, a.iunitprice,a.itaxunitprice,a.imoney,a.itax,a.isum,
-				a.inatunitprice,a.inatmoney,a.inattax,a.inatsum,a.cinvname,(a.itaxrate *100) as 'itaxrate',b.citemcode,b.citem_class as 'citemclass',a.citemname,
+		select  a.autoid,a.dlid,a.cinvcode,isnull((a.iquantity*-1),'0') as 'iquantity', isnull(a.iunitprice,'0') as 'iunitprice',isnull(a.itaxunitprice,'0') as 'itaxunitprice',isnull((a.imoney*-1),'0') as 'imoney',isnull((a.itax*-1),'0')as 'itax',isnull((a.isum*-1),'0')as 'isum',
+				isnull(a.inatunitprice,'0') as 'inatunitprice',isnull((a.inatmoney*-1),'0')as 'inatmoney',isnull((a.inattax*-1),'0') as 'inattax',isnull((a.inatsum*-1),'0') as 'inatsum',a.cinvname,(a.itaxrate *100) as 'itaxrate',b.citemcode,b.citem_class as 'citemclass',a.citemname,
 				a.citem_cname as 'citemcname', a.cunitid,a.cdefine33
 		from  CRM_U8_DeductionItem a left join CRM_U8_Deduction b
 											   on a.mid=b.id