ERP_override.git

			@@ -3,32 +3,7 @@
			PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
			<mapper namespace="com.example.erp.mapper.mm.MaterialInventoryMapper">
			<resultMap id="SelectMaterialOutbound" type="com.example.erp.entity.mm.MaterialOutboundDetail">

			<result column="mid" property="id"/>
			<result column="material_outbound_id" property="materialOutboundId"/>
			<result column="material_outbound_number" property="materialOutboundNumber"/>
			<result column="inventory_organization" property="inventoryOrganization"/>
			<result column="material_code" property="materialCode"/>
			<result column="material_name" property="materialName"/>
			<result column="producer" property="producer"/>
			<result column="width" property="width"/>
			<result column="height" property="height"/>
			<result column="unit" property="unit"/>
			<result column="thickness" property="thickness"/>
			<result column="outbound_quantity" property="outboundQuantity"/>
			<result column="single_piece_area" property="singlePieceArea"/>
			<result column="inventory_area" property="inventoryArea"/>
			<result column="date_of_manufacture" property="dateOfManufacture"/>
			<result column="remarks" property="remarks"/>

			<result column="inventory_quantity" property="materialInventory.inventoryQuantity"/>
			<result column="available_quantity" property="materialInventory.availableQuantity"/>

			<result column="reviewed_state" property="materialOutbound.reviewedState"/>


			</resultMap>


			<select id="getSelectMaterialInventoryDate">
			@@ -123,6 +98,27 @@
			mm.material_outbound mo
			<where>
			date(mo.create_time)>=#{startDate} and date(mo.create_time) <= #{endDate}
			<if test="materialOutbound.materialOutboundId != null and materialOutbound.materialOutboundId != ''">
			and mo.material_outbound_id regexp #{materialOutbound.materialOutboundId}
			</if>
			<if test="materialOutbound.materialRequisitionPersonnel != null and materialOutbound.materialRequisitionPersonnel != ''">
			and mo.material_requisition_personnel regexp #{materialOutbound.materialRequisitionPersonnel}
			</if>
			<if test="materialOutbound.materialRequisitionTeam != null and materialOutbound.materialRequisitionTeam != ''">
			and mo.material_requisition_team regexp #{materialOutbound.materialRequisitionTeam}
			</if>
			<if test="materialOutbound.orderId != null and materialOutbound.orderId != ''">
			and mo.order_id regexp #{materialOutbound.orderId}
			</if>
			<if test="materialOutbound.outboundType != null and materialOutbound.outboundType != ''">
			and mo.outbound_type regexp #{materialOutbound.outboundType}
			</if>
			<if test="materialOutbound.warehouseManager != null and materialOutbound.warehouseManager != ''">
			and mo.warehouse_manager regexp #{materialOutbound.warehouseManager}
			</if>
			<if test="materialOutbound.reviewed != null and materialOutbound.reviewed != ''">
			and mo.reviewed regexp #{materialOutbound.reviewed}
			</if>
			</where>
			order by mo.reviewed_state desc,mo.create_time desc
			limit #{offset},#{pageSize};
			@@ -136,6 +132,109 @@
			mm.material_outbound mo
			<where>
			date(mo.create_time)>=#{startDate} and date(mo.create_time) <= #{endDate}
			<if test="materialOutbound.materialOutboundId != null and materialOutbound.materialOutboundId != ''">
			and mo.material_outbound_id regexp #{materialOutbound.materialOutboundId}
			</if>
			<if test="materialOutbound.materialRequisitionPersonnel != null and materialOutbound.materialRequisitionPersonnel != ''">
			and mo.material_requisition_personnel regexp #{materialOutbound.materialRequisitionPersonnel}
			</if>
			<if test="materialOutbound.materialRequisitionTeam != null and materialOutbound.materialRequisitionTeam != ''">
			and mo.material_requisition_team regexp #{materialOutbound.materialRequisitionTeam}
			</if>
			<if test="materialOutbound.orderId != null and materialOutbound.orderId != ''">
			and mo.order_id regexp #{materialOutbound.orderId}
			</if>
			<if test="materialOutbound.outboundType != null and materialOutbound.outboundType != ''">
			and mo.outbound_type regexp #{materialOutbound.outboundType}
			</if>
			<if test="materialOutbound.warehouseManager != null and materialOutbound.warehouseManager != ''">
			and mo.warehouse_manager regexp #{materialOutbound.warehouseManager}
			</if>
			<if test="materialOutbound.reviewed != null and materialOutbound.reviewed != ''">
			and mo.reviewed regexp #{materialOutbound.reviewed}
			</if>
			</where>
			limit #{offset},#{pageSize};
			</select>


			<select id="getSelectReturningWarehouseDate">
			select
			*
			from
			mm.returning_warehouse rw
			<where>
			date(rw.create_time)>=#{startDate} and date(rw.create_time) <= #{endDate}
			<if test="returningWarehouse.returningId != null and returningWarehouse.returningId != ''">
			and rw.returning_id regexp #{returningWarehouse.returningId}
			</if>
			<if test="returningWarehouse.materialRequisitionPersonnel != null and returningWarehouse.materialRequisitionPersonnel != ''">
			and rw.material_requisition_personnel regexp #{returningWarehouse.materialRequisitionPersonnel}
			</if>
			<if test="returningWarehouse.materialRequisitionTeam != null and returningWarehouse.materialRequisitionTeam != ''">
			and rw.material_requisition_team regexp #{returningWarehouse.materialRequisitionTeam}
			</if>
			<if test="returningWarehouse.orderId != null and returningWarehouse.orderId != ''">
			and rw.order_id regexp #{returningWarehouse.orderId}
			</if>
			<if test="returningWarehouse.returningType != null and returningWarehouse.returningType != ''">
			and rw.returning_type regexp #{returningWarehouse.returningType}
			</if>
			<if test="returningWarehouse.warehouseManager != null and returningWarehouse.warehouseManager != ''">
			and rw.warehouse_manager regexp #{returningWarehouse.warehouseManager}
			</if>
			<if test="returningWarehouse.reviewed != null and returningWarehouse.reviewed != ''">
			and rw.reviewed regexp #{returningWarehouse.reviewed}
			</if>
			<if test="returningWarehouse.project != null and returningWarehouse.project != ''">
			and rw.project regexp #{returningWarehouse.project}
			</if>
			<if test="returningWarehouse.batch != null and returningWarehouse.batch != ''">
			and rw.batch regexp #{returningWarehouse.batch}
			</if>



			</where>
			order by rw.reviewed_state desc,rw.create_time desc
			limit #{offset},#{pageSize};
			</select>

			<select id="getSelectReturningWarehouseDatePageTotal">
			select
			CEILING(count(id)/#{pageSize}) as 'pageTotal',
			count(id) as 'total'
			from
			mm.returning_warehouse rw
			<where>
			date(rw.create_time)>=#{startDate} and date(rw.create_time) <= #{endDate}
			<if test="returningWarehouse.returningId != null and returningWarehouse.returningId != ''">
			and rw.returning_id regexp #{returningWarehouse.returningId}
			</if>
			<if test="returningWarehouse.materialRequisitionPersonnel != null and returningWarehouse.materialRequisitionPersonnel != ''">
			and rw.material_requisition_personnel regexp #{returningWarehouse.materialRequisitionPersonnel}
			</if>
			<if test="returningWarehouse.materialRequisitionTeam != null and returningWarehouse.materialRequisitionTeam != ''">
			and rw.material_requisition_team regexp #{returningWarehouse.materialRequisitionTeam}
			</if>
			<if test="returningWarehouse.orderId != null and returningWarehouse.orderId != ''">
			and rw.order_id regexp #{returningWarehouse.orderId}
			</if>
			<if test="returningWarehouse.returningType != null and returningWarehouse.returningType != ''">
			and rw.returning_type regexp #{returningWarehouse.returningType}
			</if>
			<if test="returningWarehouse.warehouseManager != null and returningWarehouse.warehouseManager != ''">
			and rw.warehouse_manager regexp #{returningWarehouse.warehouseManager}
			</if>
			<if test="returningWarehouse.reviewed != null and returningWarehouse.reviewed != ''">
			and rw.reviewed regexp #{returningWarehouse.reviewed}
			</if>
			<if test="returningWarehouse.project != null and returningWarehouse.project != ''">
			and rw.project regexp #{returningWarehouse.project}
			</if>
			<if test="returningWarehouse.batch != null and returningWarehouse.batch != ''">
			and rw.batch regexp #{returningWarehouse.batch}
			</if>
			</where>
			limit #{offset},#{pageSize};
			</select>
			@@ -198,6 +297,58 @@
			</select>


			<select id="getSelectReturningWarehouse">
			select
			*
			from
			mm.returning_warehouse rw
			<where>
			<if test="returningWarehouseDetail.returningId != null and returningWarehouseDetail.returningId != ''">
			and returning_id regexp #{returningWarehouseDetail.returningId}
			</if>
			</where>
			limit #{offset},#{pageSize};
			</select>

			<select id="getSelectReturningWarehouseDetail" >
			select
			rwd.inventory_id as inventoryId,
			mi.inventory_organization as inventoryOrganization,
			rwd.material_code as id,
			mi.producer,
			rwd.return_quantity as returnQuantity,
			date(mi.date_of_manufacture) as dateOfManufacture,
			mi.single_piece_area as singlePieceArea,
			mi.inventory_area as inventoryArea,
			rwd.remarks,
			mi.inventory_quantity as inventoryQuantity,
			ms.json
			from mm.returning_warehouse_detail rwd left join mm.material_inventory mi on rwd.inventory_id=mi.id
			left join mm.returning_warehouse rw on rwd.returning_id=rw.returning_id
			left join mm.material_store ms on rwd.material_code=ms.id
			<where>
			<if test="returningWarehouseDetail.returningId != null and returningWarehouseDetail.returningId != ''">
			and rwd.returning_id regexp #{returningWarehouseDetail.returningId}
			</if>
			</where>
			limit #{offset},#{pageSize};
			</select>

			<select id="getSelectReturningWarehouseDetailPageTotal">
			select
			CEILING(count(id)/#{pageSize}) as 'pageTotal',
			count(id) as 'total'
			from
			mm.returning_warehouse_detail rwd
			<where>
			<if test="returningWarehouseDetail.returningId != null and returningWarehouseDetail.returningId != ''">
			and rwd.returning_id regexp #{returningWarehouseDetail.returningId}
			</if>
			</where>
			limit #{offset},#{pageSize};
			</select>


			<insert id="insertMaterialStore" useGeneratedKeys="true" >
			insert into mm.material_store (type,json,create_time
			)
			@@ -218,27 +369,59 @@
			delete from mm.material_outbound_detail where material_outbound_id=#{materialOutboundId}
			</delete>

			<select id="getmaximum" >
			<delete id="deleteReturningWarehouseDetail" >
			delete from mm.returning_warehouse_detail where returning_id=#{returningId}
			</delete>

			<select id="getMaximum" >
			select count(*) from mm.material_outbound where date(create_time)=CURDATE()
			</select>

			<select id="getMaximums" >
			select count(*) from mm.returning_warehouse where date(create_time)=CURDATE()
			</select>

			<select id="getMaterialOutboundCount" >
			select count(*) from mm.material_outbound where material_outbound_id=#{materialOutboundId}
			</select>

			<select id="getReturningWarehouseCount" >
			select count(*) from mm.returning_warehouse where returning_id=#{returningId}
			</select>

			<select id="getMaterialOutboundDetailMaximum" >
			select count(*) from mm.material_outbound_detail where material_outbound_id=#{materialOutboundId}
			</select>

			<select id="getReturningWarehouseDetailMaximum" >
			select count(*) from mm.returning_warehouse where returning_id=#{returningId}
			</select>

			<select id="getMaterialInventoryCount" >
			select count(*) from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
			</select>

			<select id="getMaterialInventoryCountNull" >
			select count(*) from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture is null
			</select>

			<select id="getMaterialInventoryCountId" >
			select id from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
			</select>

			<select id="getMaterialInventoryCountNullId" >
			select id from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture is null
			</select>

			<select id="getIsNotMaterialOutboundDetail" >
			select * from mm.material_outbound_detail where material_outbound_id=#{materialOutboundId}
			</select>

			<insert id="insertMaterialInventoryMapper" useGeneratedKeys="true" >
			<select id="getIsNotReturningWarehouseDetail" >
			select * from mm.returning_warehouse_detail where returning_id=#{returningId}
			</select>

			<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)
			values (
			@@ -271,6 +454,36 @@
			)
			</insert>

			<insert id="insertMaterialInventoryReturning" useGeneratedKeys="true" >
			insert into mm.material_inventory (inventory_organization, material_code, producer, stock_id,
			inventory_quantity, available_quantity, safety_stock, total_area, single_piece_area,
			date_of_manufacture, quality_guarantee_period, inventory_area, dead_stock, remarks, create_time)
			values (
			#{returningWarehouseDetail.inventoryOrganization} ,#{materialCode},
			#{returningWarehouseDetail.producer},0,#{returningWarehouseDetail.returnQuantity},0,0,
			#{totalArea},#{singlePieceArea},#{returningWarehouseDetail.dateOfManufacture},#{returningWarehouseDetail.qualityGuaranteePeriod},
			#{returningWarehouseDetail.inventoryArea},0,#{returningWarehouseDetail.remarks},now()
			)
			</insert>


			<insert id="insertReturningWarehouse" useGeneratedKeys="true" >
			insert into mm.returning_warehouse(returning_id, returning_type, material_requisition_personnel, material_requisition_team,
			warehouse_manager, reviewed_state, order_id, batch, project, create_time)
			values (
			#{number} ,#{returningWarehouse.returningType},#{returningWarehouse.materialRequisitionPersonnel},#{returningWarehouse.materialRequisitionTeam},
			#{returningWarehouse.warehouseManager},0,#{returningWarehouse.orderId},#{returningWarehouse.batch},#{returningWarehouse.project},now()
			)
			</insert>

			<insert id="insertReturningWarehouseDetail" useGeneratedKeys="true" >
			insert into mm.returning_warehouse_detail (returning_id, returning_number, inventory_id, material_code, return_quantity,date_of_manufacture, remarks)
			values (
			#{number} ,#{returningWarehouseNumber},#{returningWarehouseDetail.inventoryId},#{returningWarehouseDetail.id},
			#{returningWarehouseDetail.returnQuantity},#{returningWarehouseDetail.dateOfManufacture},#{returningWarehouseDetail.remarks}
			)
			</insert>

			<update id="updateMaterialInventoryAvailableOut">
			update mm.material_inventory
			set available_quantity=available_quantity-#{quantity}
			@@ -295,6 +508,18 @@
			where id=#{inventoryId}
			</update>

			<update id="updateMaterialInventoryAvailableInventoryOut">
			update mm.material_inventory
			set available_quantity=available_quantity-#{quantity},inventory_quantity=inventory_quantity-#{quantity}
			where id=#{inventoryId}
			</update>

			<update id="updateMaterialInventoryAvailableInventoryInt">
			update mm.material_inventory
			set available_quantity=available_quantity+#{quantity},inventory_quantity=inventory_quantity+#{quantity}
			where id=#{inventoryId}
			</update>


			<update id="updateMaterialOutboundToExamine">
			update mm.material_outbound set reviewed_state=#{reviewedState},reviewed=#{reviewed},reviewed_time=now()
			@@ -306,6 +531,16 @@
			where material_outbound_id=#{materialOutboundId}
			</update>

			<update id="updateReturningWarehouseToExamine">
			update mm.returning_warehouse set reviewed_state=#{reviewedState},reviewed=#{reviewed},reviewed_time=now()
			where returning_id=#{returningId}
			</update>

			<update id="updateReturningWarehouseCounterExamination">
			update mm.returning_warehouse set reviewed_state=#{reviewedState}
			where returning_id=#{returningId}
			</update>

			<update id="updateMaterialInventory" >
			update mm.material_inventory set inventory_quantity=inventory_quantity+#{materialInventory.inventoryQuantity},
			available_quantity=available_quantity+#{materialInventory.inventoryQuantity},
			@@ -313,5 +548,28 @@
			where material_code=#{materialCode} and date_of_manufacture=#{materialInventory.dateOfManufacture}
			</update>

			<update id="updateMaterialInventoryReturning" >
			update mm.material_inventory set inventory_quantity=inventory_quantity+#{returningWarehouseDetail.returnQuantity},
			total_area=total_area+#{totalArea}
			where material_code=#{materialCode} and
			date_of_manufacture=#{returningWarehouseDetail.dateOfManufacture}


			</update>

			<update id="updateMaterialInventoryReturningNull" >
			update mm.material_inventory set inventory_quantity=inventory_quantity+#{returningWarehouseDetail.returnQuantity},
			total_area=total_area+#{totalArea}
			where material_code=#{materialCode} and
			date_of_manufacture is null


			</update>

			<update id="updateReturningWarehouseDetail" >
			update mm.returning_warehouse_detail set inventory_id=#{materialInventoryId}
			where returning_id=#{number} and returning_number=#{returningWarehouseNumber}
			</update>


			</mapper>