ERP_override.git

			@@ -35,6 +35,32 @@

			</resultMap>

			<resultMap id="selectMaterialOutboundLog" type="com.example.erp.entity.mm.MaterialLog" >
			<id column="id" property="id"/>
			<result column="operation_order_number" property="operationOrderNumber"/>
			<result column="operate_type" property="operateType"/>
			<result column="operation_number" property="operationNumber"/>
			<result column="inventory_id" property="inventoryId"/>
			<result column="material_code" property="materialCode"/>
			<result column="material_name" property="materialName"/>
			<result column="producer" property="producer"/>
			<result column="unit" property="unit"/>
			<result column="width" property="width"/>
			<result column="height" property="height"/>
			<result column="thickness" property="thickness"/>
			<result column="quantity" property="quantity"/>
			<result column="single_piece_area" property="singlePieceArea"/>
			<result column="inventory_area" property="inventoryArea"/>
			<result column="operator" property="operator"/>
			<result column="remarks" property="remarks"/>
			<result column="operate_time" property="operateTime"/>
			<result column="use_count" property="useCount"/>

			<result column="order_id" property="materialOutbound.orderId"/>
			<result column="project" property="materialOutbound.project"/>
			<result column="batch" property="materialOutbound.batch"/>
			</resultMap>



			<select id="getSelectMaterialInventoryDate">
			@@ -247,6 +273,12 @@
			<if test="materialOutbound.reviewed != null and materialOutbound.reviewed != ''">
			and mo.reviewed regexp #{materialOutbound.reviewed}
			</if>
			<if test="materialOutbound.project != null and materialOutbound.project != ''">
			and mo.project regexp #{materialOutbound.project}
			</if>
			<if test="materialOutbound.batch != null and materialOutbound.batch != ''">
			and mo.batch regexp #{materialOutbound.batch}
			</if>
			</where>
			order by mo.create_time desc
			limit #{offset},#{pageSize};
			@@ -280,6 +312,12 @@
			</if>
			<if test="materialOutbound.reviewed != null and materialOutbound.reviewed != ''">
			and mo.reviewed regexp #{materialOutbound.reviewed}
			</if>
			<if test="materialOutbound.project != null and materialOutbound.project != ''">
			and mo.project regexp #{materialOutbound.project}
			</if>
			<if test="materialOutbound.batch != null and materialOutbound.batch != ''">
			and mo.batch regexp #{materialOutbound.batch}
			</if>
			</where>
			</select>
			@@ -612,11 +650,11 @@

			<insert id="insertMaterialOutbound" useGeneratedKeys="true" >
			insert into mm.material_outbound(material_outbound_id,material_requisition_personnel,material_requisition_team,order_id,outbound_type,
			warehouse_manager,material_requisition_date,reviewed_state,create_time)
			warehouse_manager,material_requisition_date,reviewed_state,create_time,project,batch)
			values (
			#{number} ,#{materialOutbound.materialRequisitionPersonnel},#{materialOutbound.materialRequisitionTeam},
			#{materialOutbound.orderId},#{materialOutbound.outboundType},#{materialOutbound.warehouseManager},#{materialOutbound.materialRequisitionDate},
			0,now()
			0,now(),#{materialOutbound.project},#{materialOutbound.batch}
			)
			</insert>

			@@ -627,7 +665,9 @@
			order_id=#{materialOutbound.orderId},
			outbound_type=#{materialOutbound.outboundType},
			warehouse_manager=#{materialOutbound.warehouseManager},
			material_requisition_date=#{materialOutbound.materialRequisitionDate}
			material_requisition_date=#{materialOutbound.materialRequisitionDate},
			project=#{materialOutbound.project},
			batch=#{materialOutbound.batch}
			where material_outbound_id = #{number}
			</insert>

			@@ -960,9 +1000,9 @@
			where mi.id = #{id}
			</select>

			<select id="getMaterialLogReport" >
			<select id="getMaterialLogReport" resultMap="selectMaterialOutboundLog">
			select *
			from mm.material_log ml
			from mm.material_log ml left join mm.material_outbound mo on mo.material_outbound_id=ml.operation_order_number
			<where>
			date(ml.operate_time)>=#{startDate} and date(ml.operate_time) <= #{endDate} and ml.operate_type=#{type}
			<if test="materialLog.operateType != null and materialLog.operateType != ''">
			@@ -1012,10 +1052,19 @@
			and ml.operator regexp #{materialLog.operator}
			</if>
			<if test="materialLog.remarks != null and materialLog.remarks != ''">
			and ml.remarks regexp #{materialLog.remarksr}
			and ml.remarks regexp #{materialLog.remarks}
			</if>
			<if test="materialLog.projectNo != null and materialLog.projectNo != ''">
			and ml.project_no regexp #{materialLog.projectNo}
			</if>
			<if test="materialLog.materialOutbound!=null and (materialLog.materialOutbound.orderId != null and materialLog.materialOutbound.orderId != '')">
			and mo.order_id regexp #{materialLog.materialOutbound.orderId}
			</if>
			<if test=" materialLog.materialOutbound!=null and materialLog.materialOutbound.project != null and materialLog.materialOutbound.project != ''">
			and mo.project regexp #{materialLog.materialOutbound.project}
			</if>
			<if test=" materialLog.materialOutbound!=null and materialLog.materialOutbound.batch != null and materialLog.materialOutbound.batch != ''">
			and mo.batch regexp #{materialLog.materialOutbound.batch}
			</if>
			</where>
			order by ml.id desc
			@@ -1026,7 +1075,7 @@
			<select id="getMaterialLogReportTotal">
			select CEILING(count(ml.id)/#{pageSize}) as 'pageTotal',
			count(ml.id) as 'total'
			from mm.material_log ml
			from mm.material_log ml left join mm.material_outbound mo on mo.material_outbound_id=ml.operation_order_number
			<where>
			date(ml.operate_time)>=#{startDate} and date(ml.operate_time) <= #{endDate} and ml.operate_type=#{type}
			<if test="materialLog.operateType != null and materialLog.operateType != ''">
			@@ -1076,7 +1125,19 @@
			and ml.operator regexp #{materialLog.operator}
			</if>
			<if test="materialLog.remarks != null and materialLog.remarks != ''">
			and ml.remarks regexp #{materialLog.remarksr}
			and ml.remarks regexp #{materialLog.remarks}
			</if>
			<if test="materialLog.projectNo != null and materialLog.projectNo != ''">
			and ml.project_no regexp #{materialLog.projectNo}
			</if>
			<if test="materialLog.materialOutbound!=null and (materialLog.materialOutbound.orderId != null and materialLog.materialOutbound.orderId != '')">
			and mo.order_id regexp #{materialLog.materialOutbound.orderId}
			</if>
			<if test=" materialLog.materialOutbound!=null and materialLog.materialOutbound.project != null and materialLog.materialOutbound.project != ''">
			and mo.project regexp #{materialLog.materialOutbound.project}
			</if>
			<if test=" materialLog.materialOutbound!=null and materialLog.materialOutbound.batch != null and materialLog.materialOutbound.batch != ''">
			and mo.batch regexp #{materialLog.materialOutbound.batch}
			</if>
			</where>
			</select>
			@@ -1231,4 +1292,23 @@
			AND date( ml.operate_time )>= #{startDate} and date(ml.operate_time) <= #{endDate}
			and ml.operate_type=#{type}
			</select>


			<select id="getSelectMaterialInventoryMes">
			select
			mi.id,
			mi.material_code AS materialCode,
			mi.producer,
			sum(mi.available_quantity) AS availableQuantity,
			JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.width')) AS width,
			JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.height')) AS height,
			JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.thickness')) AS thickness,
			JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.name')) AS name,
			JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.model')) AS model,
			JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.unit')) AS unit
			from mm.material_inventory mi left join mm.material_store ms on mi.material_code=ms.id
			where mi.available_quantity>0
			group by mi.material_code
			order by mi.id desc
			</select>
			</mapper>