ERP_override.git

			@@ -3,9 +3,7 @@
			import com.example.erp.entity.mm.FinishedGoodsInventory;
			import com.example.erp.entity.mm.FinishedOperateLog;
			import com.example.erp.entity.pp.FlowCard;
			import com.example.erp.entity.sd.Order;
			import com.example.erp.entity.sd.OrderDetail;
			import com.example.erp.entity.sd.Product;
			import com.example.erp.entity.sd.*;
			import com.example.erp.entity.userInfo.User;
			import org.apache.ibatis.annotations.Mapper;
			import org.apache.ibatis.annotations.Param;
			@@ -35,10 +33,18 @@
			Integer findOrderNumberdcount(@Param("orderId") String orderId,
			@Param("orderNumber") Integer orderNumber);

			FinishedGoodsInventory findOrderNumberd(@Param("orderId") String orderId,
			@Param("orderNumber") Integer orderNumber);

			OrderDetail findOrderDetailNumberd(@Param("orderId") String orderId,
			@Param("orderNumber") Integer orderNumber);

			Integer finishedGoodsInventorybycount(@Param("orderId") String orderId,
			@Param("orderNumber") Integer orderNumber);

			Integer findOrderQuantity(String orderId);

			Delivery findOrderDelivery(String orderId);

			Integer findOrderNumberdsum(String orderId);

			@@ -61,11 +67,15 @@

			Boolean updateIntOrderNumberConut( @Param("orderId") String orderId,
			@Param("orderNumber") Integer orderNumber,
			@Param("quantity") Integer quantity);
			@Param("quantity") Long quantity);

			Boolean updateOutOrderNumberConut( @Param("orderId") String orderId,
			@Param("orderNumber") Integer orderNumber,
			@Param("quantity") Integer quantity);

			Boolean updateOrderNumberConut( @Param("orderId") String orderId,
			@Param("orderNumber") Integer orderNumber,
			@Param("quantity") Long quantity);


			Boolean updateOrderWarehousingState(String orderId,Integer state);
			@@ -85,6 +95,8 @@
			List<OrderDetail> getSelectDeliveryDetail(@Param("offset") Integer offset,
			@Param("pageSize") Integer pageSize,
			@Param("orderDetail") OrderDetail orderDetail);

			List<OrderDetail> getSelectDeliveryDetailDeliveryId(@Param("deliveryId") String deliveryId);

			Map<String,Integer> getSelectDeliveryDetailPageTotal(Integer offset, Integer pageSize,OrderDetail orderDetail);

			@@ -121,6 +133,11 @@

			Boolean updateOrderInventory(@Param("orderDetail") OrderDetail orderDetail);

			FlowCard findFlowCard(FlowCard flowCard);

			DeliveryDetail findDeliverydetail(@Param("orderId") String orderId,
			@Param("orderNumber") Integer orderNumber,@Param("deliveryId") String deliveryId);


			}