|  |  | @ -5,7 +5,8 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     <select id="filterStockOrderDetail" parameterType="com.glxp.api.admin.req.business.StockOrderDetailFilterRequest" |  |  |  |     <select id="filterStockOrderDetail" parameterType="com.glxp.api.admin.req.business.StockOrderDetailFilterRequest" | 
			
		
	
		
		
			
				
					
					|  |  |  |             resultType="com.glxp.api.admin.entity.business.StockOrderDetailEntity"> |  |  |  |             resultType="com.glxp.api.admin.entity.business.StockOrderDetailEntity"> | 
			
		
	
		
		
			
				
					
					|  |  |  |         select * from stock_order_detail |  |  |  |         select stock_order_detail.*,basic_udirel.allowNoBatch from stock_order_detail | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         left join basic_udirel on stock_order_detail.relId = basic_udirel.id | 
			
		
	
		
		
			
				
					
					|  |  |  |         <where> |  |  |  |         <where> | 
			
		
	
		
		
			
				
					
					|  |  |  |             <if test="orderIdFk != '' and orderIdFk!=null"> |  |  |  |             <if test="orderIdFk != '' and orderIdFk!=null"> | 
			
		
	
		
		
			
				
					
					|  |  |  |                 and orderIdFk = #{orderIdFk} |  |  |  |                 and orderIdFk = #{orderIdFk} | 
			
		
	
	
		
		
			
				
					|  |  | @ -23,6 +24,7 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  |                 and expireDate = #{expireDate} |  |  |  |                 and expireDate = #{expireDate} | 
			
		
	
		
		
			
				
					
					|  |  |  |             </if> |  |  |  |             </if> | 
			
		
	
		
		
			
				
					
					|  |  |  |         </where> |  |  |  |         </where> | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         group by stock_order_detail.id | 
			
		
	
		
		
			
				
					
					|  |  |  |         ORDER BY id DESC |  |  |  |         ORDER BY id DESC | 
			
		
	
		
		
			
				
					
					|  |  |  |     </select> |  |  |  |     </select> | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
	
		
		
			
				
					|  |  | @ -33,7 +35,7 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  |         basic_products.cpmctymc,basic_products.ggxh, |  |  |  |         basic_products.cpmctymc,basic_products.ggxh, | 
			
		
	
		
		
			
				
					
					|  |  |  |         stock_order_detail.batchNo,stock_order_detail.expireDate,stock_order_detail.productDate, |  |  |  |         stock_order_detail.batchNo,stock_order_detail.expireDate,stock_order_detail.productDate, | 
			
		
	
		
		
			
				
					
					|  |  |  |         stock_order_detail.count,stock_order_detail.reCount,stock_order_detail.sweepCount,stock_order_detail.relId, |  |  |  |         stock_order_detail.count,stock_order_detail.reCount,stock_order_detail.sweepCount,stock_order_detail.relId, | 
			
		
	
		
		
			
				
					
					|  |  |  |         basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,stock_order_detail.price,stock_order_detail.allowNoBatch |  |  |  |         basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,stock_order_detail.price | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         from stock_order_detail |  |  |  |         from stock_order_detail | 
			
		
	
		
		
			
				
					
					|  |  |  |         right JOIN basic_products |  |  |  |         right JOIN basic_products | 
			
		
	
		
		
			
				
					
					|  |  |  |         ON stock_order_detail.productId = basic_products.uuid |  |  |  |         ON stock_order_detail.productId = basic_products.uuid | 
			
		
	
	
		
		
			
				
					|  |  | @ -63,7 +65,7 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  |         replace |  |  |  |         replace | 
			
		
	
		
		
			
				
					
					|  |  |  |         INTO stock_order_detail(id, |  |  |  |         INTO stock_order_detail(id, | 
			
		
	
		
		
			
				
					
					|  |  |  |         orderIdFk,productId,productName,spec,batchNo,productDate, |  |  |  |         orderIdFk,productId,productName,spec,batchNo,productDate, | 
			
		
	
		
		
			
				
					
					|  |  |  |         expireDate,count,reCount,sweepCount,ylqxzcrbarmc,zczbhhzbapzbh,price,relId,manufactory,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate,allowNoBatch) |  |  |  |         expireDate,count,reCount,sweepCount,ylqxzcrbarmc,zczbhhzbapzbh,price,relId,manufactory,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate) | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         values( |  |  |  |         values( | 
			
		
	
		
		
			
				
					
					|  |  |  |         #{id}, |  |  |  |         #{id}, | 
			
		
	
		
		
			
				
					
					|  |  |  |         #{orderIdFk}, |  |  |  |         #{orderIdFk}, | 
			
		
	
	
		
		
			
				
					|  |  | @ -84,7 +86,8 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  |         #{firstSalesInvNo}, |  |  |  |         #{firstSalesInvNo}, | 
			
		
	
		
		
			
				
					
					|  |  |  |         #{secSalesInvNo}, |  |  |  |         #{secSalesInvNo}, | 
			
		
	
		
		
			
				
					
					|  |  |  |         #{secSalesListNo}, |  |  |  |         #{secSalesListNo}, | 
			
		
	
		
		
			
				
					
					|  |  |  |         #{invoiceDate},#{allowNoBatch} |  |  |  |         #{invoiceDate} | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         ) |  |  |  |         ) | 
			
		
	
		
		
			
				
					
					|  |  |  |     </insert> |  |  |  |     </insert> | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
	
		
		
			
				
					|  |  | @ -92,7 +95,7 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  |             parameterType="com.glxp.api.admin.entity.business.StockOrderDetailEntity"> |  |  |  |             parameterType="com.glxp.api.admin.entity.business.StockOrderDetailEntity"> | 
			
		
	
		
		
			
				
					
					|  |  |  |         replace INTO stock_order_detail(id, |  |  |  |         replace INTO stock_order_detail(id, | 
			
		
	
		
		
			
				
					
					|  |  |  |         orderIdFk,productId,productName,spec,batchNo,productDate, |  |  |  |         orderIdFk,productId,productName,spec,batchNo,productDate, | 
			
		
	
		
		
			
				
					
					|  |  |  |         expireDate,count,reCount,sweepCount,ylqxzcrbarmc,zczbhhzbapzbh,price,relId,manufactory,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate,allowNoBatch) |  |  |  |         expireDate,count,reCount,sweepCount,ylqxzcrbarmc,zczbhhzbapzbh,price,relId,manufactory,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate) | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         values |  |  |  |         values | 
			
		
	
		
		
			
				
					
					|  |  |  |         <foreach collection="stockOrderDetailEntities" item="item" index="index" |  |  |  |         <foreach collection="stockOrderDetailEntities" item="item" index="index" | 
			
		
	
		
		
			
				
					
					|  |  |  |                  separator=","> |  |  |  |                  separator=","> | 
			
		
	
	
		
		
			
				
					|  |  | @ -109,7 +112,7 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  |             #{item.reCount}, |  |  |  |             #{item.reCount}, | 
			
		
	
		
		
			
				
					
					|  |  |  |             #{item.sweepCount}, |  |  |  |             #{item.sweepCount}, | 
			
		
	
		
		
			
				
					
					|  |  |  |             #{item.ylqxzcrbarmc}, |  |  |  |             #{item.ylqxzcrbarmc}, | 
			
		
	
		
		
			
				
					
					|  |  |  |             #{item.zczbhhzbapzbh},#{item.price},#{item.relId},#{item.manufactory},#{item.firstSalesInvNo},#{item.secSalesInvNo},#{item.secSalesListNo},#{item.invoiceDate},#{item.allowNoBatch} |  |  |  |             #{item.zczbhhzbapzbh},#{item.price},#{item.relId},#{item.manufactory},#{item.firstSalesInvNo},#{item.secSalesInvNo},#{item.secSalesListNo},#{item.invoiceDate} | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |             ) |  |  |  |             ) | 
			
		
	
		
		
			
				
					
					|  |  |  |         </foreach> |  |  |  |         </foreach> | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
	
		
		
			
				
					|  |  | @ -132,7 +135,6 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  |             <if test="invoiceDate != null">invoiceDate=#{invoiceDate},</if> |  |  |  |             <if test="invoiceDate != null">invoiceDate=#{invoiceDate},</if> | 
			
		
	
		
		
			
				
					
					|  |  |  |             <if test="relId != null">relId=#{relId},</if> |  |  |  |             <if test="relId != null">relId=#{relId},</if> | 
			
		
	
		
		
			
				
					
					|  |  |  |             <if test="manufactory != null">manufactory=#{manufactory},</if> |  |  |  |             <if test="manufactory != null">manufactory=#{manufactory},</if> | 
			
		
	
		
		
			
				
					
					|  |  |  |             <if test="allowNoBatch != null">allowNoBatch=#{allowNoBatch},</if> |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         </set> |  |  |  |         </set> | 
			
		
	
		
		
			
				
					
					|  |  |  |         WHERE id = #{id} |  |  |  |         WHERE id = #{id} | 
			
		
	
	
		
		
			
				
					|  |  | 
 |